From e76e27e165640bda7363f5c6996ff1a7655bc535 Mon Sep 17 00:00:00 2001
From: Alkalus <draknyte1@hotmail.com>
Date: Thu, 16 Nov 2017 16:29:01 +1000
Subject: $ First fix towards invalid tile entity mapping.

---
 .../machines/basic/GregtechMetaWirelessCharger.java      | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic')

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java
index f0b2958c17..a2714c4bab 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java
@@ -448,6 +448,9 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity {
 
 	@Override
 	public void onRemoval() {
+		
+		ChargingHelper.removeEntry(getTileEntityPosition(), this);
+		
 		mWirelessChargingMap.clear();
 		mLocalChargingMap.clear();
 		if (!this.getBaseMetaTileEntity().getWorld().playerEntities.isEmpty()){
@@ -459,7 +462,6 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity {
 			}
 		}
 
-		ChargingHelper.removeEntry(getTileEntityPosition(), this);
 
 		super.onRemoval();
 	}
@@ -502,4 +504,16 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity {
 		super.onServerStart();
 	}
 
+	@Override
+	public void onExplosion() {
+		ChargingHelper.removeEntry(getTileEntityPosition(), this);
+		super.onExplosion();
+	}
+
+	@Override
+	public void doExplosion(long aExplosionPower) {
+		ChargingHelper.removeEntry(getTileEntityPosition(), this);
+		super.doExplosion(aExplosionPower);
+	}
+
 }
\ No newline at end of file
-- 
cgit