Anvilcraft/GregTech4
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Misc fixes

Browse source 
Closes #30
This commit is contained in:
TheDarkDnKTv 2020-08-20 20:00:49 +03:00
parent 66aca973fe
commit a54195b0ac
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/main/java/gregtechmod/common/tileentities/energy/production/GT_MetaTileEntity_DragonEggEnergySiphon.java
View file

@ -29,7 +29,7 @@ public class GT_MetaTileEntity_DragonEggEnergySiphon extends MetaTileEntity {
public static boolean sAllowMultipleEggs = false, sAllowFlux = true; public static boolean sAllowMultipleEggs = false, sAllowFlux = true;
private SoftReference<TileNode> cachedNode = new SoftReference<>(null); private SoftReference<TileNode> cachedNode = new SoftReference<>(null);
public static GT_MetaTileEntity_DragonEggEnergySiphon mActiveSiphon = null; public static SoftReference<GT_MetaTileEntity_DragonEggEnergySiphon> mActiveSiphon = new SoftReference<>(null);
public GT_MetaTileEntity_DragonEggEnergySiphon(int aID, String mName) { public GT_MetaTileEntity_DragonEggEnergySiphon(int aID, String mName) {
super(aID, mName); super(aID, mName);
@ -75,17 +75,17 @@ public class GT_MetaTileEntity_DragonEggEnergySiphon extends MetaTileEntity {
@Override @Override
public void onServerStart() { public void onServerStart() {
mActiveSiphon = null; mActiveSiphon.clear();
} }
@Override @Override
public void onServerStop() { public void onServerStop() {
mActiveSiphon = null; mActiveSiphon.clear();
} }
@Override @Override
public void onFirstTick() { public void onFirstTick() {
mActiveSiphon = null; mActiveSiphon.clear();
} }
@Override @Override
@ -134,14 +134,14 @@ public class GT_MetaTileEntity_DragonEggEnergySiphon extends MetaTileEntity {
} }
} }
} }
if (mActiveSiphon != this && !sAllowMultipleEggs) if (mActiveSiphon.get() != this && !sAllowMultipleEggs)
if (mActiveSiphon == null || mActiveSiphon.getBaseMetaTileEntity() == null || mActiveSiphon.getBaseMetaTileEntity().isInvalidTileEntity() || !mActiveSiphon.hasEgg()) if (mActiveSiphon.get() == null || mActiveSiphon.get().getBaseMetaTileEntity() == null || mActiveSiphon.get().getBaseMetaTileEntity().isInvalidTileEntity() || !mActiveSiphon.get().hasEgg())
mActiveSiphon = this; mActiveSiphon = new SoftReference<>(this);
else else
getBaseMetaTileEntity().doExplosion(Integer.MAX_VALUE); getBaseMetaTileEntity().doExplosion(Integer.MAX_VALUE);
} else { } else {
if (mActiveSiphon == this) { if (mActiveSiphon.get() == this) {
mActiveSiphon = null; mActiveSiphon.clear();
} }
} }
} }
@ -203,8 +203,8 @@ public class GT_MetaTileEntity_DragonEggEnergySiphon extends MetaTileEntity {
@Override @Override
public void inValidate() { public void inValidate() {
if (mActiveSiphon == this) { if (mActiveSiphon.get() == this) {
mActiveSiphon = null; mActiveSiphon.clear();
} }
} }