summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJames Clarke <jamesrtclarke@me.com>2013-02-05 20:34:02 +0000
committerfeildmaster <admin@feildmaster.com>2013-02-06 16:45:22 -0600
commit5bb81b75c73898613f4dae3066945d0a9042067a (patch)
treee6df8a6e032eda185dc65039baeed537d8e6a322 /src
parent2e99e02094f51f581f7f98411e47a0f29cdeb3d6 (diff)
downloadcraftbukkit-5bb81b75c73898613f4dae3066945d0a9042067a.tar
craftbukkit-5bb81b75c73898613f4dae3066945d0a9042067a.tar.gz
craftbukkit-5bb81b75c73898613f4dae3066945d0a9042067a.tar.lz
craftbukkit-5bb81b75c73898613f4dae3066945d0a9042067a.tar.xz
craftbukkit-5bb81b75c73898613f4dae3066945d0a9042067a.zip
Set CraftTravelAgent.DEFAULT to a non-null value. Fixes BUKKIT-3578
Currently, CraftTravelAgent will call s() on the passed-in WorldServer in order to set DEFAULT. However, s() will always return null at this point, because WorldServer.P will still be null, as it is set after the constructor is called. Instead, we set CraftTravelAgent.DEFAULT to the instance that is being constructed.
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/CraftTravelAgent.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftTravelAgent.java b/src/main/java/org/bukkit/craftbukkit/CraftTravelAgent.java
index 3a313e53..fad2d8aa 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftTravelAgent.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftTravelAgent.java
@@ -18,7 +18,7 @@ public class CraftTravelAgent extends PortalTravelAgent implements TravelAgent {
public CraftTravelAgent(WorldServer worldserver) {
super(worldserver);
if (DEFAULT == null && worldserver.dimension == 0) {
- DEFAULT = (TravelAgent) worldserver.s();
+ DEFAULT = this;
}
}