$ Redid the LivingEntityUpdate event, fix it not working as intended.

$ Fixed persistent player mappings to null Wireless Chargers.

1 files changed, 3 insertions, 5 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java
index bd5f1abc54..688b522c2b 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java
@@ -1,14 +1,11 @@
 package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
 import cpw.mods.fml.common.FMLCommonHandler;
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_ModHandler;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.helpers.ChargingHelper;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaWirelessCharger;
-import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.MinecraftForge;
 
 public class GregtechWirelessChargers {
 
@@ -19,7 +16,8 @@ public class GregtechWirelessChargers {
 				| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED;
 		int mID = 890;		
 
-		FMLCommonHandler.instance().bus().register(ChargingHelper.class);
+		FMLCommonHandler.instance().bus().register(new ChargingHelper());
+		MinecraftForge.EVENT_BUS.register(new ChargingHelper());
 		
 		GregtechItemList.Charger_LV.set(new GregtechMetaWirelessCharger(mID++, "wificharger.01.tier.single",
 				"Wireless Charger MK I", 1, "Hopefully won't give you cancer.", 0).getStackForm(1L));