Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-09-19 18:31:18 +02:00
Code Issues Projects Releases Wiki Activity

Use the result of EntityPortalExitEvent. Fixes BUKKIT-3559.

Browse Source
This commit is contained in:
James Clarke 2013-02-02 23:02:08 +00:00 committed by feildmaster
parent 1090e0cf46
commit 94da64ee93
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/net/minecraft/server/PortalTravelAgent.java
View File

@ -301,11 +301,19 @@ public class PortalTravelAgent {
this.a.getServer().getPluginManager().callEvent(event); this.a.getServer().getPluginManager().callEvent(event);
Location to = event.getTo(); Location to = event.getTo();
if (event.isCancelled() || to == null || !entity.isAlive()) { if (event.isCancelled() || to == null || !entity.isAlive()) {
position = from; position.setX(from.getX());
velocity = before; position.setY(from.getY());
position.setZ(from.getZ());
position.setYaw(from.getYaw());
position.setPitch(from.getPitch());
velocity.copy(before);
} else { } else {
position = to; position.setX(to.getX());
velocity = event.getAfter(); position.setY(to.getY());
position.setZ(to.getZ());
position.setYaw(to.getYaw());
position.setPitch(to.getPitch());
velocity.copy(event.getAfter()); // event.getAfter() will never be null, as setAfter() will cause an NPE if null is passed in
} }
// CraftBukkit end // CraftBukkit end
} }