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

Small fix to container registry. emptyContainer is not null, it's "NULL_EMPTYCONTAINER" now and won't match any valid container.

Browse source
This commit is contained in:
Christian 2013-08-28 22:16:59 -04:00
parent 5a8def7d00
commit 4eb05ed571
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/net/minecraftforge/fluids/FluidContainerRegistry.java
View file

@ -31,6 +31,7 @@ public abstract class FluidContainerRegistry
public static final int BUCKET_VOLUME = 1000; public static final int BUCKET_VOLUME = 1000;
public static final ItemStack EMPTY_BUCKET = new ItemStack(Item.bucketEmpty); public static final ItemStack EMPTY_BUCKET = new ItemStack(Item.bucketEmpty);
public static final ItemStack EMPTY_BOTTLE = new ItemStack(Item.glassBottle); public static final ItemStack EMPTY_BOTTLE = new ItemStack(Item.glassBottle);
private static final ItemStack NULL_EMPTYCONTAINER = new ItemStack(Item.bucketEmpty);
static static
{ {
@ -126,7 +127,7 @@ public abstract class FluidContainerRegistry
} }
containerFluidMap.put(Arrays.asList(data.filledContainer.itemID, data.filledContainer.getItemDamage()), data); containerFluidMap.put(Arrays.asList(data.filledContainer.itemID, data.filledContainer.getItemDamage()), data);
if (data.emptyContainer != null) if (data.emptyContainer != null && data.emptyContainer != NULL_EMPTYCONTAINER)
{ {
filledContainerMap.put(Arrays.asList(data.emptyContainer.itemID, data.emptyContainer.getItemDamage(), data.fluid.fluidID), data); filledContainerMap.put(Arrays.asList(data.emptyContainer.itemID, data.emptyContainer.getItemDamage(), data.fluid.fluidID), data);
emptyContainers.add(Arrays.asList(data.emptyContainer.itemID, data.emptyContainer.getItemDamage())); emptyContainers.add(Arrays.asList(data.emptyContainer.itemID, data.emptyContainer.getItemDamage()));
@ -240,6 +241,7 @@ public abstract class FluidContainerRegistry
public final ItemStack filledContainer; public final ItemStack filledContainer;
public final ItemStack emptyContainer; public final ItemStack emptyContainer;
public FluidContainerData(FluidStack stack, ItemStack filledContainer, ItemStack emptyContainer) public FluidContainerData(FluidStack stack, ItemStack filledContainer, ItemStack emptyContainer)
{ {
this(stack, filledContainer, emptyContainer, false); this(stack, filledContainer, emptyContainer, false);
@ -249,7 +251,7 @@ public abstract class FluidContainerRegistry
{ {
this.fluid = stack; this.fluid = stack;
this.filledContainer = filledContainer; this.filledContainer = filledContainer;
this.emptyContainer = emptyContainer; this.emptyContainer = emptyContainer == null ? NULL_EMPTYCONTAINER : emptyContainer;
if (stack == null || filledContainer == null || emptyContainer == null && !nullEmpty) if (stack == null || filledContainer == null || emptyContainer == null && !nullEmpty)
{ {