From 9783e2148ad0981f11b60f718acf9923ebdc2fbc Mon Sep 17 00:00:00 2001 From: cp Date: Wed, 23 Apr 2014 10:12:21 +0800 Subject: [PATCH] Merged fix for: #605 Server Crashing - java.lang.IllegalArgumentException: Empty string not allowed/NBT --- ReleaseNotes.txt | 4 ++++ .../enderio/teleport/TileTravelAnchor.java | 16 +++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index c262dafa..31a57340 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -9,6 +9,10 @@ - Added 'Combustion Generator' - Added per side auto 'push/push' of items/fluids to all machines - Overhaul of machine UI's, adding more information +- Machines maintained their inventory, upgrades, power and IO modes when broken + +1.0.2 +- #605 Server Crashing - java.lang.IllegalArgumentException: Empty string not allowed/NBT 1.0.1 - #567 Improved server startup times when using large EnderIO power networks diff --git a/src/main/java/crazypants/enderio/teleport/TileTravelAnchor.java b/src/main/java/crazypants/enderio/teleport/TileTravelAnchor.java index 6aebfa0b..a165ff86 100644 --- a/src/main/java/crazypants/enderio/teleport/TileTravelAnchor.java +++ b/src/main/java/crazypants/enderio/teleport/TileTravelAnchor.java @@ -22,7 +22,7 @@ public class TileTravelAnchor extends TileEntityEio implements ITravelAccessable PROTECTED } - private AccessMode accessMode = AccessMode.PRIVATE; + private AccessMode accessMode = AccessMode.PUBLIC; private ItemStack[] password = new ItemStack[5]; @@ -197,7 +197,9 @@ public class TileTravelAnchor extends TileEntityEio implements ITravelAccessable @Override protected void writeCustomNBT(NBTTagCompound root) { root.setShort("accessMode", (short) accessMode.ordinal()); - root.setString("placedBy", placedBy); + if(placedBy != null && placedBy.trim().length() > 0) { + root.setString("placedBy", placedBy); + } for (int i = 0; i < password.length; i++) { ItemStack stack = password[i]; if(stack != null) { @@ -208,9 +210,13 @@ public class TileTravelAnchor extends TileEntityEio implements ITravelAccessable } StringBuffer userStr = new StringBuffer(); for (String user : authorisedUsers) { - userStr.append(user); - userStr.append(","); + if(user != null && user.trim().length() > 0) { + userStr.append(user); + userStr.append(","); + } + } + if(authorisedUsers.size() > 0) { + root.setString("authorisedUsers", userStr.toString()); } - root.setString("authorisedUsers", userStr.toString()); } }