Merged fix for: #605 Server Crashing - java.lang.IllegalArgumentException: Empty string not allowed/NBT

This commit is contained in:
cp committed 2014-04-23 10:12:21 +08:00
1 parent 44e4bebe46
commit 9783e2148a
2 files changed
+15 -5

No files matched your search

+4
View File
@@ -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
@@ -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());
}
}