From 49d50e7b5fd3aaa52b566581319769a06588920b Mon Sep 17 00:00:00 2001
From: EdGruberman <ed@rjump.com>
Date: Tue, 22 Jan 2013 18:25:41 -0700
Subject: Only use TravelAgent if supplied; Addresses BUKKIT-3466

If there is no TravelAgent assigned, it can not be used.
---
 src/main/java/org/bukkit/event/player/PlayerPortalEvent.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

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() {
-- 
cgit v1.2.3