% Fixed InnovativeOnlineIndustries#19

(cherry picked from commit af502b6) # Conflicts: # gradle.properties
blizzard4591 · Jan 13, 2018 · b0cedd9 · b0cedd9
1 parent 4ec21f7
commit b0cedd9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/com/buuz135/industrial/tile/misc/BlackHoleUnitTile.java b/src/main/java/com/buuz135/industrial/tile/misc/BlackHoleUnitTile.java
@@ -174,8 +174,9 @@ public void readFromNBT(NBTTagCompound compound) {
         else {
             Item item = Item.getByNameOrId(compound.getString(NBT_ITEMSTACK));
             if (item != null) {
-                stack = new ItemStack(item, 1, compound.hasKey(NBT_META) ? compound.getInteger(NBT_META) : 0);
-                if (compound.hasKey(NBT_ITEM_NBT)) stack.setTagCompound(compound.getCompoundTag(NBT_ITEM_NBT));
+                stack = new ItemStack(item, 1, compound.getInteger(NBT_META));
+                NBTTagCompound nbttag = compound.getCompoundTag(NBT_ITEM_NBT);
+                if (!nbttag.hasNoTags()) stack.setTagCompound(nbttag);
             }
         }
         if (!compound.hasKey(NBT_AMOUNT)) amount = 0;

diff --git a/src/main/java/com/buuz135/industrial/utils/IFFakePlayer.java b/src/main/java/com/buuz135/industrial/utils/IFFakePlayer.java
@@ -10,9 +10,10 @@ public class IFFakePlayer extends FakePlayer {
 
     private static final UUID uuid = UUID.fromString("ec5b5875-ebb5-4b47-833b-0de37ac9e6d7");
 
-    private static GameProfile PROFILE = new GameProfile(uuid, "[IFFarmer]");
+    private static GameProfile PROFILE = new GameProfile(uuid, "[IF]");
 
     public IFFakePlayer(WorldServer worldIn) {
         super(worldIn, PROFILE);
     }
+
 }