summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEdGruberman <ed@rjump.com>2013-01-22 18:25:41 -0700
committerfeildmaster <admin@feildmaster.com>2013-01-24 04:05:49 -0600
commit49d50e7b5fd3aaa52b566581319769a06588920b (patch)
tree778f5fde3632257c1e3af0c3d935313dbf398705 /src
parent0d14642362bc93f9545b0c104e4aff4e2a1a98e9 (diff)
downloadbukkit-49d50e7b5fd3aaa52b566581319769a06588920b.tar
bukkit-49d50e7b5fd3aaa52b566581319769a06588920b.tar.gz
bukkit-49d50e7b5fd3aaa52b566581319769a06588920b.tar.lz
bukkit-49d50e7b5fd3aaa52b566581319769a06588920b.tar.xz
bukkit-49d50e7b5fd3aaa52b566581319769a06588920b.zip
Only use TravelAgent if supplied; Addresses BUKKIT-3466
If there is no TravelAgent assigned, it can not be used.
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/bukkit/event/player/PlayerPortalEvent.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/event/player/PlayerPortalEvent.java b/src/main/java/org/bukkit/event/player/PlayerPortalEvent.java
index 1114f5c7..4706811f 100644
--- a/src/main/java/org/bukkit/event/player/PlayerPortalEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerPortalEvent.java
@@ -28,7 +28,7 @@ public class PlayerPortalEvent extends PlayerTeleportEvent {
}
public boolean useTravelAgent() {
- return useTravelAgent;
+ return useTravelAgent && travelAgent != null;
}
public TravelAgent getPortalTravelAgent() {