diff options
| author | James Clarke <jamesrtclarke@me.com> | 2013-02-02 12:34:14 +0000 |
|---|---|---|
| committer | feildmaster <admin@feildmaster.com> | 2013-02-04 18:53:04 -0600 |
| commit | d661c67a7042970785132138673320ea1de3f343 (patch) | |
| tree | aa358127a4540ea229293e1e4177c2537ac2b1f9 /src/main/java/net/minecraft | |
| parent | 94da64ee935f3710668f7dcc1aa94c74bd2bbb20 (diff) | |
| download | craftbukkit-d661c67a7042970785132138673320ea1de3f343.tar craftbukkit-d661c67a7042970785132138673320ea1de3f343.tar.gz craftbukkit-d661c67a7042970785132138673320ea1de3f343.tar.lz craftbukkit-d661c67a7042970785132138673320ea1de3f343.tar.xz craftbukkit-d661c67a7042970785132138673320ea1de3f343.zip | |
Always use the set exit location for portal events. Fixes BUKKIT-3555.
Diffstat (limited to 'src/main/java/net/minecraft')
| -rw-r--r-- | src/main/java/net/minecraft/server/Entity.java | 2 | ||||
| -rw-r--r-- | src/main/java/net/minecraft/server/PlayerList.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java index 26b7a1f3..87efe2cb 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1771,7 +1771,7 @@ public abstract class Entity { if (event.isCancelled() || event.getTo() == null || !this.isAlive()) { return; } - exit = event.useTravelAgent() ? event.getPortalTravelAgent().findOrCreate(exit) : event.getTo(); + exit = event.useTravelAgent() ? event.getPortalTravelAgent().findOrCreate(event.getTo()) : event.getTo(); this.teleportTo(exit, true); } } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java index e9f6a6bd..0ad5c43b 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -459,7 +459,7 @@ public abstract class PlayerList { return; } - exit = event.useTravelAgent() ? event.getPortalTravelAgent().findOrCreate(exit) : event.getTo(); + exit = event.useTravelAgent() ? event.getPortalTravelAgent().findOrCreate(event.getTo()) : event.getTo(); exitWorld = ((CraftWorld) exit.getWorld()).getHandle(); Vector velocity = entityplayer.getBukkitEntity().getVelocity(); |