aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/xmod/gregtech
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2022-02-13 12:57:51 +0000
committerGitHub <noreply@github.com>2022-02-13 13:57:51 +0100
commita92fac98086fcace97af30149148a5a32083e8ca (patch)
tree505f4471983edeb4780560ebf18a99c1a50cce34 /src/main/java/gtPlusPlus/xmod/gregtech
parent92780c970591fd7656859e868adc3583ec70011c (diff)
downloadGT5-Unofficial-a92fac98086fcace97af30149148a5a32083e8ca.tar.gz
GT5-Unofficial-a92fac98086fcace97af30149148a5a32083e8ca.tar.bz2
GT5-Unofficial-a92fac98086fcace97af30149148a5a32083e8ca.zip
Fix Wireless Charger. (#121)
Fix Nano Healer.
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech')
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java
index 6f0176da25..665a1f78df 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java
@@ -149,14 +149,15 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity {
@Override
public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
- mWirelessChargingMap.clear();
- mLocalChargingMap.clear();
if (aPlayer.isSneaking()) {
mLocked = !mLocked;
PlayerUtils.messagePlayer(aPlayer, mLocked ? "Locked to owner." : "Unlocked.");
+ return;
}
+ mWirelessChargingMap.clear();
+ mLocalChargingMap.clear();
if (!this.getBaseMetaTileEntity().getWorld().playerEntities.isEmpty()){
for (Object mTempPlayer : this.getBaseMetaTileEntity().getWorld().playerEntities){
if (mTempPlayer instanceof EntityPlayer || mTempPlayer instanceof EntityPlayerMP){
@@ -444,11 +445,6 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity {
}
}
}
- if (mWirelessChargingMap.containsKey(mTemp.getDisplayName())){
- if (mWirelessChargingMap.remove(mTemp.getDisplayName()) != null){
- ChargingHelper.removeValidPlayer(mTemp, this);
- }
- }
}
/*if (this.mMode == 0 || this.mMode == 2){
int tempRange = (int) (this.mMode == 0 ? 4*GT_Values.V[this.mTier] : 2*GT_Values.V[this.mTier]);