From d748630f56b0e10101a2c9207a77cc8bff0bd362 Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Tue, 5 Feb 2013 20:34:02 +0000 Subject: [PATCH] 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. By: James Clarke --- .../src/main/java/org/bukkit/craftbukkit/CraftTravelAgent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftTravelAgent.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftTravelAgent.java index 3a313e534..fad2d8aac 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftTravelAgent.java +++ b/paper-server/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; } }