Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-23 11:06:29 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-3864: Protect against suffocation on world change

Browse Source
This commit is contained in:
md_5 2018-03-22 21:05:34 +11:00
parent 7e94e65a1c
commit 29705a0d4f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nms-patches/PlayerList.patch
View File

@ -621,7 +621,7 @@
+ exitWorld.getTravelAgent().adjustExit(entityplayer, exit, velocity); + exitWorld.getTravelAgent().adjustExit(entityplayer, exit, velocity);
+ +
+ entityplayer.worldChangeInvuln = true; // CraftBukkit - Set teleport invulnerability only if player changing worlds + 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()) { + if (entityplayer.motX != velocity.getX() || entityplayer.motY != velocity.getY() || entityplayer.motZ != velocity.getZ()) {
+ entityplayer.getBukkitEntity().setVelocity(velocity); + entityplayer.getBukkitEntity().setVelocity(velocity);
+ } + }