diff --git a/src/main/java/net/jomcraft/frustrator/items/ItemFrustrator.java b/src/main/java/net/jomcraft/frustrator/items/ItemFrustrator.java index 560b75d..285ac9b 100644 --- a/src/main/java/net/jomcraft/frustrator/items/ItemFrustrator.java +++ b/src/main/java/net/jomcraft/frustrator/items/ItemFrustrator.java @@ -150,7 +150,6 @@ public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPl pos1 = Vec3.createVectorHelper(ClientEventHandler.selectedTrigger.minX, ClientEventHandler.selectedTrigger.minY, ClientEventHandler.selectedTrigger.minZ); pos2 = Vec3.createVectorHelper(ClientEventHandler.selectedTrigger.maxX, ClientEventHandler.selectedTrigger.maxY, ClientEventHandler.selectedTrigger.maxZ); } else { - //LINK!! Frustrator.network.sendToServer(new C2SChangeChannelPacket(ClientEventHandler.currentChannelID, Vec3.createVectorHelper(ClientEventHandler.focusedTrigger.minX, ClientEventHandler.focusedTrigger.minY, ClientEventHandler.focusedTrigger.minZ), Vec3.createVectorHelper(ClientEventHandler.focusedTrigger.maxX, ClientEventHandler.focusedTrigger.maxY, ClientEventHandler.focusedTrigger.maxZ))); } } diff --git a/src/main/java/net/jomcraft/frustrator/network/C2SNewAreaPacket.java b/src/main/java/net/jomcraft/frustrator/network/C2SNewAreaPacket.java index 9d4c754..d0e3efc 100644 --- a/src/main/java/net/jomcraft/frustrator/network/C2SNewAreaPacket.java +++ b/src/main/java/net/jomcraft/frustrator/network/C2SNewAreaPacket.java @@ -43,6 +43,7 @@ public void fromBytes(ByteBuf buf) { this.pos2 = Vec3.createVectorHelper(buf.readInt(), buf.readInt(), buf.readInt()); if (buf.readBoolean()) this.parent = new FrustumBounds(buf.readInt(), buf.readInt(), buf.readInt(), buf.readInt(), buf.readInt(), buf.readInt(), false, null, -1); + this.channelID = buf.readInt(); } diff --git a/src/main/java/net/jomcraft/frustrator/storage/FileManager.java b/src/main/java/net/jomcraft/frustrator/storage/FileManager.java index 1a07584..89de87e 100644 --- a/src/main/java/net/jomcraft/frustrator/storage/FileManager.java +++ b/src/main/java/net/jomcraft/frustrator/storage/FileManager.java @@ -68,10 +68,8 @@ public static void initialize() { } catch (Exception e) { Frustrator.log.log(Level.ERROR, "Exception while reading frustum file: ", e); - // if (e instanceof JsonSyntaxException) { frustratorFile.renameTo(new File(frustratorFolder, "frustums_malformed.json")); initJSON(); - // } } } else {