lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix Binding::fromStack returning null on stacks with binding tags

Browse source 
Added Binding::toString
This commit is contained in:
TeamDman 2018-12-05 16:25:58 -05:00 committed by Nick Ignoffo
parent 259b631f7d
commit 54a2b053d0
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/WayofTime/bloodmagic/core/data/Binding.java
View file

@ -57,9 +57,12 @@ public class Binding implements INBTSerializable<NBTTagCompound> {
@Nullable @Nullable
public static Binding fromStack(ItemStack stack) { public static Binding fromStack(ItemStack stack) {
if (!stack.hasTagCompound()) // Definitely hasn't been bound yet. // if (!stack.hasTagCompound()) // Definitely hasn't been bound yet.
// return null;
if (stack.getTagCompound() == null) // hasTagCompound doesn't work on empty stacks with tags
return null; return null;
NBTBase bindingTag = stack.getTagCompound().getTag("binding"); NBTBase bindingTag = stack.getTagCompound().getTag("binding");
if (bindingTag == null || bindingTag.getId() != 10 || bindingTag.hasNoTags()) // Make sure it's both a tag compound and that it has actual data. if (bindingTag == null || bindingTag.getId() != 10 || bindingTag.hasNoTags()) // Make sure it's both a tag compound and that it has actual data.
return null; return null;
@ -68,4 +71,9 @@ public class Binding implements INBTSerializable<NBTTagCompound> {
binding.deserializeNBT((NBTTagCompound) bindingTag); binding.deserializeNBT((NBTTagCompound) bindingTag);
return binding; return binding;
} }
@Override
public String toString() {
return "Binding{" + "uuid=" + uuid + ", name='" + name + '\'' + '}';
}
} }