From 3ea49a159dea38240ea6aecbf5583b429129f9ad Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Tue, 20 Nov 2018 21:34:15 +1100 Subject: [PATCH] SPIGOT-4494: Remove fix for SPIGOT-3864, better handled by SPIGOT-3879 fix By: md_5 --- paper-server/nms-patches/PlayerList.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paper-server/nms-patches/PlayerList.patch b/paper-server/nms-patches/PlayerList.patch index 79a7b7a704..09fd484b7b 100644 --- a/paper-server/nms-patches/PlayerList.patch +++ b/paper-server/nms-patches/PlayerList.patch @@ -598,7 +598,7 @@ + exitWorld.getTravelAgent().adjustExit(entityplayer, exit, velocity); + + entityplayer.worldChangeInvuln = true; // CraftBukkit - Set teleport invulnerability only if player changing worlds -+ this.moveToWorld(entityplayer, exitWorld.dimension, true, exit, true); // SPIGOT-3864 ++ this.moveToWorld(entityplayer, exitWorld.dimension, true, exit, false); // Vanilla doesn't check for suffocation when handling portals, so neither should we + if (entityplayer.motX != velocity.getX() || entityplayer.motY != velocity.getY() || entityplayer.motZ != velocity.getZ()) { + entityplayer.getBukkitEntity().setVelocity(velocity); + }