Fix potential errors on nbt serialization.

elytra · Sep 4, 2017 · b6eb450 · b6eb450
1 parent 51bbac1
commit b6eb450
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/src/main/java/com/elytradev/teckle/common/tile/TileFilter.java b/src/main/java/com/elytradev/teckle/common/tile/TileFilter.java
@@ -339,10 +339,13 @@ public NBTTagCompound writeToNBT(NBTTagCompound tag) {
         } else {
             tag.removeTag("colour");
         }
-        tag.setUniqueId("buffer", bufferID);
-        tag.setUniqueId("filter", filterID);
 
         if (FMLCommonHandler.instance().getEffectiveSide().isServer()) {
+            if(bufferData == null || filterData == null)
+                validate();
+            tag.setUniqueId("buffer", bufferData.getId());
+            tag.setUniqueId("filter", filterData.getId());
+
             tag.setInteger("databaseID", getWorld().provider.getDimension());
             if (networkTile.getNode() == null)
                 getNetworkAssistant(ItemStack.class).onNodePlaced(world, pos);

diff --git a/src/main/java/com/elytradev/teckle/common/tile/TileTransposer.java b/src/main/java/com/elytradev/teckle/common/tile/TileTransposer.java
@@ -281,6 +281,8 @@ public boolean canFitItemsInBuffer() {
     @Override
     public NBTTagCompound writeToNBT(NBTTagCompound tag) {
         if (FMLCommonHandler.instance().getEffectiveSide().isServer() && !(this instanceof TileFilter)) {
+            if(bufferData == null)
+                validate();
             tag.setUniqueId("buffer", bufferData.getId());
 
             tag.setInteger("databaseID", getWorld().provider.getDimension());

diff --git a/src/main/java/com/elytradev/teckle/common/tile/sortingmachine/TileSortingMachine.java b/src/main/java/com/elytradev/teckle/common/tile/sortingmachine/TileSortingMachine.java
@@ -353,10 +353,13 @@ public NBTTagCompound writeToNBT(NBTTagCompound tag) {
             }
         }
         tag.setTag("colours", coloursTag);
-        tag.setUniqueId("buffer", bufferID);
-        tag.setUniqueId("filter", filterID);
 
         if (FMLCommonHandler.instance().getEffectiveSide().isServer()) {
+            if(bufferData == null || filterData == null)
+                validate();
+            tag.setUniqueId("buffer", bufferData.getId());
+            tag.setUniqueId("filter", filterData.getId());
+
             tag.setInteger("databaseID", getWorld().provider.getDimension());
             if (inputTile.getNode() == null || outputTile.getNode() == null)
                 getNetworkAssistant(ItemStack.class).onNodePlaced(world, pos);