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

Safety for UUID check in lava crystal (#1238)

Browse source 
some weird mod was doing weird tooltip things weirdly
This commit is contained in:
Nicholas Ignoffo 2018-02-23 16:47:34 -08:00
parent cf9e6e207f
commit bf2fe1166e
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java
View file

@ -5,6 +5,7 @@ import WayofTime.bloodmagic.util.Constants;
import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.helper.NetworkHelper;
import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.util.helper.PlayerHelper;
import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.client.IVariantProvider;
import com.google.common.base.Strings;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.MobEffects; import net.minecraft.init.MobEffects;
@ -23,8 +24,8 @@ public class ItemLavaCrystal extends ItemBindableBase implements IVariantProvide
@Override @Override
public ItemStack getContainerItem(ItemStack itemStack) { public ItemStack getContainerItem(ItemStack itemStack) {
String uuid = getOwnerUUID(itemStack); String uuid = getOwnerUUID(itemStack);
if (uuid != null) if (!Strings.isNullOrEmpty(uuid))
NetworkHelper.getSoulNetwork(this.getOwnerUUID(itemStack)).syphon(25); NetworkHelper.getSoulNetwork(uuid).syphon(25);
ItemStack returnStack = new ItemStack(this); ItemStack returnStack = new ItemStack(this);
returnStack.setTagCompound(itemStack.getTagCompound()); returnStack.setTagCompound(itemStack.getTagCompound());
@ -38,7 +39,7 @@ public class ItemLavaCrystal extends ItemBindableBase implements IVariantProvide
@Override @Override
public int getItemBurnTime(ItemStack stack) { public int getItemBurnTime(ItemStack stack) {
if (getOwnerUUID(stack) == null) if (Strings.isNullOrEmpty(getOwnerUUID(stack)))
return -1; return -1;
if (NetworkHelper.canSyphonFromContainer(stack, 25)) if (NetworkHelper.canSyphonFromContainer(stack, 25))