keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Merge pull request #1297 from ShetiPhian/patch-1

Browse source 
Legacy Liquid Load Fix
This commit is contained in:
LexManos 2014-08-05 19:47:58 -07:00
commit 98285e4df6
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/net/minecraftforge/fluids/FluidStack.java
View file

@ -2,7 +2,7 @@
package net.minecraftforge.fluids; package net.minecraftforge.fluids;
import java.util.Locale; import java.util.Locale;
import com.google.common.base.Strings;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
@ -60,7 +60,7 @@ public class FluidStack
return null; return null;
} }
String fluidName = nbt.getString("FluidName"); String fluidName = nbt.getString("FluidName");
if (fluidName == null) if (Strings.isNullOrEmpty(fluidName))
{ {
fluidName = nbt.hasKey("LiquidName") ? nbt.getString("LiquidName").toLowerCase(Locale.ENGLISH) : null; fluidName = nbt.hasKey("LiquidName") ? nbt.getString("LiquidName").toLowerCase(Locale.ENGLISH) : null;
fluidName = Fluid.convertLegacyName(fluidName); fluidName = Fluid.convertLegacyName(fluidName);