diff --git a/src/main/java/vazkii/botania/common/core/helper/ItemNBTHelper.java b/src/main/java/vazkii/botania/common/core/helper/ItemNBTHelper.java index c6832a082..258bcb32d 100644 --- a/src/main/java/vazkii/botania/common/core/helper/ItemNBTHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/ItemNBTHelper.java @@ -130,7 +130,7 @@ public final class ItemNBTHelper { @Nullable public static UUID getUuid(ItemStack stack, String tag) { - return verifyExistance(stack, tag) ? stack.getOrCreateTag().getUniqueId(tag) : null; + return verifyExistance(stack, tag + "Most") && verifyExistance(stack, tag + "Least") ? stack.getOrCreateTag().getUniqueId(tag) : null; } public static ListNBT getList(ItemStack stack, String tag, int objtype, boolean nullifyOnFail) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java index 5de4a76fb..3dc7603a6 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java @@ -40,6 +40,7 @@ import java.util.UUID; public class ItemTerraSword extends ItemManasteelSword implements ILensEffect { + // todo 1.14 use throwableentity's owner system instead of tracking it ourselves private static final String TAG_ATTACKER_UUID = "attackerUuid"; private static final int MANA_PER_DAMAGE = 100;