diff --git a/src/main/java/ellpeck/actuallyadditions/ActuallyAdditions.java b/src/main/java/ellpeck/actuallyadditions/ActuallyAdditions.java index ee787c9ba..a0459901b 100644 --- a/src/main/java/ellpeck/actuallyadditions/ActuallyAdditions.java +++ b/src/main/java/ellpeck/actuallyadditions/ActuallyAdditions.java @@ -117,10 +117,6 @@ public class ActuallyAdditions{ Util.registerDispenserHandler(Items.bucket, new DispenserHandlerFillBucket()); Util.registerDispenserHandler(InitItems.itemFertilizer, new DispenserHandlerFertilize()); - if(LaserRelayConnectionHandler.getInstance() == null){ - LaserRelayConnectionHandler.setInstance(new LaserRelayConnectionHandler()); - } - WorldData.init(event.getServer()); } diff --git a/src/main/java/ellpeck/actuallyadditions/misc/LaserRelayConnectionHandler.java b/src/main/java/ellpeck/actuallyadditions/misc/LaserRelayConnectionHandler.java index 3575ec955..1f1736e44 100644 --- a/src/main/java/ellpeck/actuallyadditions/misc/LaserRelayConnectionHandler.java +++ b/src/main/java/ellpeck/actuallyadditions/misc/LaserRelayConnectionHandler.java @@ -31,13 +31,12 @@ public class LaserRelayConnectionHandler{ public ConcurrentSet networks = new ConcurrentSet(); public static LaserRelayConnectionHandler getInstance(){ + if(instance == null){ + instance = new LaserRelayConnectionHandler(); + } return instance; } - public static void setInstance(LaserRelayConnectionHandler i){ - instance = i; - } - public NBTTagCompound writeNetworkToNBT(Network network){ NBTTagList list = new NBTTagList(); for(ConnectionPair pair : network.connections){