diff options
| author | md_5 <git@md-5.net> | 2018-03-22 21:05:34 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2018-03-22 21:05:34 +1100 |
| commit | 29705a0d4f65440b4d91cba67d63bbac884a833e (patch) | |
| tree | c5a1f98e3be874ba31ec8eef4d6e9c7a050d52a4 | |
| parent | 7e94e65a1ca93e86dbc2eed3cca77c8a9ed8c102 (diff) | |
| download | craftbukkit-29705a0d4f65440b4d91cba67d63bbac884a833e.tar craftbukkit-29705a0d4f65440b4d91cba67d63bbac884a833e.tar.gz craftbukkit-29705a0d4f65440b4d91cba67d63bbac884a833e.tar.lz craftbukkit-29705a0d4f65440b4d91cba67d63bbac884a833e.tar.xz craftbukkit-29705a0d4f65440b4d91cba67d63bbac884a833e.zip | |
SPIGOT-3864: Protect against suffocation on world change
| -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 c61f54fd..ddd3b4d0 100644 --- a/nms-patches/PlayerList.patch +++ b/nms-patches/PlayerList.patch @@ -621,7 +621,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, false); // Vanilla doesn't check for suffocation when handling portals, so neither should we ++ this.moveToWorld(entityplayer, exitWorld.dimension, true, exit, true); // SPIGOT-3864 + if (entityplayer.motX != velocity.getX() || entityplayer.motY != velocity.getY() || entityplayer.motZ != velocity.getZ()) { + entityplayer.getBukkitEntity().setVelocity(velocity); + } |