diff --git a/src/main/java/kamkeel/npcs/entity/EntityAbilityZone.java b/src/main/java/kamkeel/npcs/entity/EntityAbilityZone.java index 23120b80b..8bd722325 100644 --- a/src/main/java/kamkeel/npcs/entity/EntityAbilityZone.java +++ b/src/main/java/kamkeel/npcs/entity/EntityAbilityZone.java @@ -834,15 +834,6 @@ public class EntityAbilityZone extends Entity implements IEntityAdditionalSpawnD // NBT SERIALIZATION // ═══════════════════════════════════════════════════════════════════ - @Override - protected void readEntityFromNBT(NBTTagCompound nbt) { - // Intentionally empty — ability entities are transient (not saved to world) - } - - @Override - protected void writeEntityToNBT(NBTTagCompound nbt) { - // Intentionally empty — ability entities are transient (not saved to world) - } // ═══════════════════════════════════════════════════════════════════ // SPAWN DATA (ByteBuf for client sync) diff --git a/src/main/java/kamkeel/npcs/entity/EntityEnergyAbility.java b/src/main/java/kamkeel/npcs/entity/EntityEnergyAbility.java index 46c2647e8..9d6e8ab88 100644 --- a/src/main/java/kamkeel/npcs/entity/EntityEnergyAbility.java +++ b/src/main/java/kamkeel/npcs/entity/EntityEnergyAbility.java @@ -376,6 +376,22 @@ public abstract class EntityEnergyAbility extends Entity implements IEntityAddit magicData.readToNBT(nbt); } + // ==================== WORLD NBT (INTENTIONALLY EMPTY) ==================== + + /** + * Ability entities are transient — they must not survive world saves. + * If Minecraft deserializes one from a chunk, kill it immediately. + */ + @Override + protected void readEntityFromNBT(NBTTagCompound nbt) { + this.setDead(); + } + + @Override + protected void writeEntityToNBT(NBTTagCompound nbt) { + // Intentionally empty — ability entities are transient (not saved to world) + } + // ==================== SPAWN DATA ==================== /** diff --git a/src/main/java/kamkeel/npcs/entity/EntityEnergyDome.java b/src/main/java/kamkeel/npcs/entity/EntityEnergyDome.java index c107b57f7..565a662d4 100644 --- a/src/main/java/kamkeel/npcs/entity/EntityEnergyDome.java +++ b/src/main/java/kamkeel/npcs/entity/EntityEnergyDome.java @@ -695,15 +695,6 @@ public class EntityEnergyDome extends EntityEnergyBarrier { // ==================== NBT ==================== - @Override - protected void readEntityFromNBT(NBTTagCompound nbt) { - // Intentionally empty — ability entities are transient (not saved to world) - } - - @Override - protected void writeEntityToNBT(NBTTagCompound nbt) { - // Intentionally empty — ability entities are transient (not saved to world) - } @Override protected void writeSpawnNBT(NBTTagCompound nbt) { diff --git a/src/main/java/kamkeel/npcs/entity/EntityEnergyExplosion.java b/src/main/java/kamkeel/npcs/entity/EntityEnergyExplosion.java index b23f1f269..8c69b6aa0 100644 --- a/src/main/java/kamkeel/npcs/entity/EntityEnergyExplosion.java +++ b/src/main/java/kamkeel/npcs/entity/EntityEnergyExplosion.java @@ -289,15 +289,6 @@ public class EntityEnergyExplosion extends EntityEnergyAbility { // ==================== NBT ==================== - @Override - protected void readEntityFromNBT(NBTTagCompound nbt) { - // Intentionally empty - transient visual entity. - } - - @Override - protected void writeEntityToNBT(NBTTagCompound nbt) { - // Intentionally empty - transient visual entity. - } @Override protected void writeSpawnNBT(NBTTagCompound nbt) { diff --git a/src/main/java/kamkeel/npcs/entity/EntityEnergyPanel.java b/src/main/java/kamkeel/npcs/entity/EntityEnergyPanel.java index 0ec982fe7..77c5c680d 100644 --- a/src/main/java/kamkeel/npcs/entity/EntityEnergyPanel.java +++ b/src/main/java/kamkeel/npcs/entity/EntityEnergyPanel.java @@ -730,15 +730,6 @@ public class EntityEnergyPanel extends EntityEnergyBarrier { // ==================== NBT ==================== - @Override - protected void readEntityFromNBT(NBTTagCompound nbt) { - // Intentionally empty — ability entities are transient (not saved to world) - } - - @Override - protected void writeEntityToNBT(NBTTagCompound nbt) { - // Intentionally empty — ability entities are transient (not saved to world) - } @Override protected void writeSpawnNBT(NBTTagCompound nbt) { diff --git a/src/main/java/kamkeel/npcs/entity/EntityEnergyProjectile.java b/src/main/java/kamkeel/npcs/entity/EntityEnergyProjectile.java index 1d9c02fcc..c51949386 100644 --- a/src/main/java/kamkeel/npcs/entity/EntityEnergyProjectile.java +++ b/src/main/java/kamkeel/npcs/entity/EntityEnergyProjectile.java @@ -2413,15 +2413,6 @@ public abstract class EntityEnergyProjectile extends EntityEnergyAbility { // ==================== NBT ==================== - @Override - protected void readEntityFromNBT(NBTTagCompound nbt) { - // Intentionally empty — ability entities are transient (not saved to world) - } - - @Override - protected void writeEntityToNBT(NBTTagCompound nbt) { - // Intentionally empty — ability entities are transient (not saved to world) - } @Override protected void writeSpawnNBT(NBTTagCompound nbt) { diff --git a/src/main/java/kamkeel/npcs/entity/EntityEnergySweeper.java b/src/main/java/kamkeel/npcs/entity/EntityEnergySweeper.java index d8596cf08..0c5c48c23 100644 --- a/src/main/java/kamkeel/npcs/entity/EntityEnergySweeper.java +++ b/src/main/java/kamkeel/npcs/entity/EntityEnergySweeper.java @@ -423,15 +423,6 @@ public class EntityEnergySweeper extends EntityEnergyAbility { // ==================== NBT ==================== - @Override - protected void readEntityFromNBT(NBTTagCompound nbt) { - // Intentionally empty — ability entities are transient (not saved to world) - } - - @Override - protected void writeEntityToNBT(NBTTagCompound nbt) { - // Intentionally empty — ability entities are transient (not saved to world) - } @Override protected void writeSpawnNBT(NBTTagCompound nbt) {