mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-04 05:54:43 +01:00
SPIGOT-4494: Remove fix for SPIGOT-3864, better handled by SPIGOT-3879 fix
This commit is contained in:
parent
e4183e7069
commit
f489f0f745
1 changed files with 1 additions and 1 deletions
|
@ -598,7 +598,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, 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()) {
|
+ if (entityplayer.motX != velocity.getX() || entityplayer.motY != velocity.getY() || entityplayer.motZ != velocity.getZ()) {
|
||||||
+ entityplayer.getBukkitEntity().setVelocity(velocity);
|
+ entityplayer.getBukkitEntity().setVelocity(velocity);
|
||||||
+ }
|
+ }
|
||||||
|
|
Loading…
Reference in a new issue