From 42a6401c0d74fc1d9f423f8c07474ec81be249c6 Mon Sep 17 00:00:00 2001
From: Ellpeck <megamaximal@gmail.com>
Date: Sat, 31 Oct 2015 15:21:50 +0100
Subject: [PATCH] Fix Laser Relay Network. Damn it.

---
 .../java/ellpeck/actuallyadditions/ActuallyAdditions.java  | 4 ----
 .../misc/LaserRelayConnectionHandler.java                  | 7 +++----
 2 files changed, 3 insertions(+), 8 deletions(-)

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<Network> networks = new ConcurrentSet<Network>();
 
     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){