diff options
| author | md_5 <git@md-5.net> | 2018-11-20 21:34:15 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2018-11-20 21:34:15 +1100 |
| commit | f489f0f745f54783835475b980a3aee4b5cdfcf0 (patch) | |
| tree | 70e6f8422e687536ed689b06b82b0c425f0349a2 | |
| parent | e4183e7069107a8e2bdb9b1d3f30a663e27614d3 (diff) | |
| download | craftbukkit-f489f0f745f54783835475b980a3aee4b5cdfcf0.tar craftbukkit-f489f0f745f54783835475b980a3aee4b5cdfcf0.tar.gz craftbukkit-f489f0f745f54783835475b980a3aee4b5cdfcf0.tar.lz craftbukkit-f489f0f745f54783835475b980a3aee4b5cdfcf0.tar.xz craftbukkit-f489f0f745f54783835475b980a3aee4b5cdfcf0.zip | |
SPIGOT-4494: Remove fix for SPIGOT-3864, better handled by SPIGOT-3879 fix
| -rw-r--r-- | nms-patches/PlayerList.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nms-patches/PlayerList.patch b/nms-patches/PlayerList.patch index 79a7b7a7..09fd484b 100644 --- a/nms-patches/PlayerList.patch +++ b/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); + } |