wzp/Folia
1
0
Fork 0
mirror of https://github.com/PaperMC/Folia.git synced 2025-04-23 04:39:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make end portalling use relative delta movement and rotation

Browse Source 
This brings the logic for delta movement (velocity) and
rotation in-line with Vanilla.

This is aimed to fix issues with wither skulls stacking with
end portals, as previously the velocity was set to zero which
prevented them from colliding and blowing up.
This commit is contained in:
Spottedleaf 2025-02-16 11:25:45 -08:00
parent 5b5e45a560
commit 2dac12e8c8
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
folia-server/minecraft-patches/sources/net/minecraft/world/entity/Entity.java.patch
View File

@ -200,7 +200,7 @@
if (!this.level().paperConfig().scoreboards.allowNonPlayerEntitiesOnScoreboards && !(this instanceof Player)) { return null; } // Paper - Perf: Disable Scoreboards for non players by default if (!this.level().paperConfig().scoreboards.allowNonPlayerEntitiesOnScoreboards && !(this instanceof Player)) { return null; } // Paper - Perf: Disable Scoreboards for non players by default
return this.level().getScoreboard().getPlayersTeam(this.getScoreboardName()); return this.level().getScoreboard().getPlayersTeam(this.getScoreboardName());
} }
@@ -3722,8 +_,791 @@ @@ -3722,8 +_,793 @@
this.portalProcess = entity.portalProcess; this.portalProcess = entity.portalProcess;
} }
@ -708,7 +708,8 @@
+ // on the obsidian, we need to spawn at targetPos.y - 1 + // on the obsidian, we need to spawn at targetPos.y - 1
+ portalInfoCompletable.complete( + portalInfoCompletable.complete(
+ new net.minecraft.world.level.portal.TeleportTransition( + new net.minecraft.world.level.portal.TeleportTransition(
+ destination, Vec3.atBottomCenterOf(targetPos.below()), Vec3.ZERO, 90.0f, 0.0f, + destination, Vec3.atBottomCenterOf(targetPos.below()), Vec3.ZERO, Direction.WEST.toYRot(), 0.0f,
+ Relative.union(Relative.DELTA, Set.of(Relative.X_ROT)),
+ TeleportTransition.PLAY_PORTAL_SOUND.then(TeleportTransition.PLACE_PORTAL_TICKET), + TeleportTransition.PLAY_PORTAL_SOUND.then(TeleportTransition.PLACE_PORTAL_TICKET),
+ org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.END_PORTAL + org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.END_PORTAL
+ ) + )
@ -727,7 +728,8 @@
+ // done + // done
+ portalInfoCompletable.complete( + portalInfoCompletable.complete(
+ new net.minecraft.world.level.portal.TeleportTransition( + new net.minecraft.world.level.portal.TeleportTransition(
+ destination, Vec3.atBottomCenterOf(adjustedSpawn), Vec3.ZERO, 90.0f, 0.0f, + destination, Vec3.atBottomCenterOf(adjustedSpawn), Vec3.ZERO, 0.0f, 0.0f,
+ Relative.union(Relative.DELTA, Relative.ROTATION),
+ TeleportTransition.PLAY_PORTAL_SOUND.then(TeleportTransition.PLACE_PORTAL_TICKET), + TeleportTransition.PLAY_PORTAL_SOUND.then(TeleportTransition.PLACE_PORTAL_TICKET),
+ org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.END_PORTAL + org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.END_PORTAL
+ ) + )