From 5c909e156f806e47caae66e99bc7aa06344e3f02 Mon Sep 17 00:00:00 2001 From: BallOfEnergy <66693744+BallOfEnergy1@users.noreply.github.com> Date: Sat, 12 Oct 2024 22:32:58 -0500 Subject: [PATCH] there i fixed it :woo: --- src/main/java/com/hbm/tileentity/TileEntityMachineBase.java | 1 - .../com/hbm/tileentity/turret/TileEntityTurretBaseNT.java | 6 ++---- .../com/hbm/tileentity/turret/TileEntityTurretMaxwell.java | 3 ++- .../com/hbm/tileentity/turret/TileEntityTurretTauon.java | 3 ++- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/hbm/tileentity/TileEntityMachineBase.java b/src/main/java/com/hbm/tileentity/TileEntityMachineBase.java index 06e2ca21e..3d623eea3 100644 --- a/src/main/java/com/hbm/tileentity/TileEntityMachineBase.java +++ b/src/main/java/com/hbm/tileentity/TileEntityMachineBase.java @@ -23,7 +23,6 @@ public abstract class TileEntityMachineBase extends TileEntityLoadedBase impleme private String customName; - private NBTTagCompound lastPackedNBT = null; private ByteBuf lastPackedBuf = null; public TileEntityMachineBase(int slotCount) { diff --git a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java index 579c6d6a1..81359800c 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java @@ -256,7 +256,6 @@ public abstract class TileEntityTurretBaseNT extends TileEntityMachineBase imple @Override public void serialize(ByteBuf buf) { - super.serialize(buf); BufferUtil.writeVec3(buf, this.tPos); buf.writeDouble(this.rotationPitch); buf.writeDouble(this.rotationYaw); @@ -271,11 +270,10 @@ public abstract class TileEntityTurretBaseNT extends TileEntityMachineBase imple @Override public void deserialize(ByteBuf buf) { - super.deserialize(buf); this.turnProgress = 2; this.tPos = BufferUtil.readVec3(buf); - this.rotationPitch = buf.readDouble(); - this.rotationYaw = buf.readDouble(); + this.syncRotationPitch = buf.readDouble(); + this.syncRotationYaw = buf.readDouble(); this.power = buf.readLong(); this.isOn = buf.readBoolean(); this.targetPlayers = buf.readBoolean(); diff --git a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretMaxwell.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretMaxwell.java index 8d4462b54..fe4bbca21 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretMaxwell.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretMaxwell.java @@ -282,7 +282,8 @@ public class TileEntityTurretMaxwell extends TileEntityTurretBaseNT implements I @Override public void deserialize(ByteBuf buf) { - if(buf.readBoolean()) + boolean shot = buf.readBoolean(); + if(shot) this.beam = 5; else super.deserialize(buf); diff --git a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretTauon.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretTauon.java index 2306cb2f4..7f9b163e6 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretTauon.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretTauon.java @@ -162,7 +162,8 @@ public class TileEntityTurretTauon extends TileEntityTurretBaseNT { @Override public void deserialize(ByteBuf buf) { - if(buf.readBoolean()) + boolean shot = buf.readBoolean(); + if(shot) this.beam = 3; else super.deserialize(buf);