mirror of
https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git
synced 2026-01-25 10:32:49 +00:00
Fix: setDead() now correctly calls cancel()
This commit is contained in:
parent
bf2a4b776f
commit
9bb9a56452
@ -133,6 +133,13 @@ public class EntityNukeExplosionMK5 extends EntityExplosionChunkloading {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setDead(){
|
||||||
|
if(explosion != null)
|
||||||
|
explosion.cancel();
|
||||||
|
super.setDead();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void readEntityFromNBT(NBTTagCompound nbt) {
|
protected void readEntityFromNBT(NBTTagCompound nbt) {
|
||||||
this.ticksExisted = nbt.getInteger("ticksExisted");
|
this.ticksExisted = nbt.getInteger("ticksExisted");
|
||||||
|
|||||||
@ -272,6 +272,13 @@ public class ExplosionNukeRayBatched implements IExplosionRay {
|
|||||||
processChunk();
|
processChunk();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void cancel() {
|
||||||
|
isAusf3Complete = true;
|
||||||
|
if (perChunk != null) perChunk.clear();
|
||||||
|
if (orderedChunks != null) orderedChunks.clear();
|
||||||
|
}
|
||||||
|
|
||||||
public class FloatTriplet {
|
public class FloatTriplet {
|
||||||
public float xCoord;
|
public float xCoord;
|
||||||
public float yCoord;
|
public float yCoord;
|
||||||
|
|||||||
@ -195,6 +195,7 @@ public class ExplosionNukeRayParallelized implements IExplosionRay {
|
|||||||
return collectFinished && destroyFinished;
|
return collectFinished && destroyFinished;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public void cancel() {
|
public void cancel() {
|
||||||
this.collectFinished = true;
|
this.collectFinished = true;
|
||||||
this.destroyFinished = true;
|
this.destroyFinished = true;
|
||||||
|
|||||||
@ -6,4 +6,6 @@ public interface IExplosionRay {
|
|||||||
void cacheChunksTick(int processTime);
|
void cacheChunksTick(int processTime);
|
||||||
|
|
||||||
void destructionTick(int processTime);
|
void destructionTick(int processTime);
|
||||||
|
|
||||||
|
void cancel();
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user