diff options
2 files changed, 6 insertions, 2 deletions
diff --git a/src/main/java/com/github/technus/tectech/mechanics/data/RendererMessage.java b/src/main/java/com/github/technus/tectech/mechanics/data/RendererMessage.java index 4bb6d9028d..70ea9cd158 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/data/RendererMessage.java +++ b/src/main/java/com/github/technus/tectech/mechanics/data/RendererMessage.java @@ -13,6 +13,7 @@ import net.minecraftforge.common.DimensionManager; import thaumcraft.client.fx.bolt.FXLightningBolt; import java.io.*; +import java.util.Arrays; import java.util.HashSet; public class RendererMessage implements IMessage { @@ -23,7 +24,10 @@ public class RendererMessage implements IMessage { @Override public void fromBytes(ByteBuf pBuffer) { try { - InputStream is = new ByteArrayInputStream(pBuffer.array()); + //I'd love to know why I need to offset by one byte for this to work + byte[] boop = pBuffer.array(); + boop = Arrays.copyOfRange(boop, 1, boop.length); + InputStream is = new ByteArrayInputStream(boop); ObjectInputStream ois = new ObjectInputStream(is); Object data = ois.readObject(); sparkList = (HashSet<Util.thaumSpark>)data; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java index 57089bea7a..690afd8ee6 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java @@ -290,7 +290,7 @@ public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryB }
}
sparkCount++;
- if (sparkCount == 60){
+ if (sparkCount == 60 && !sparkList.isEmpty()){
sparkCount = 0;
World aWorld = aBaseMetaTileEntity.getWorld();
Iterator iterator = aWorld.playerEntities.iterator();
|