Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-26 08:48:34 +01:00
Code Issues Projects Releases Wiki Activity

Fixed a Bug with the ESD not asking if the Item is valid for a Slot when the slot content is null

Browse source
This commit is contained in:
Ellpeck 2015-07-12 03:13:06 +02:00
parent a6053be99e
commit 9c931c7836
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/ellpeck/actuallyadditions/tile/TileEntityEnergizer.java
View file

@ -67,7 +67,6 @@ public class TileEntityEnergizer extends TileEntityInventoryBase implements IEne
@Override @Override
public boolean canExtractItem(int slot, ItemStack stack, int side){ public boolean canExtractItem(int slot, ItemStack stack, int side){
System.out.println(stack.getItem() instanceof IEnergyContainerItem);
return slot == 1; return slot == 1;
} }

2
src/main/java/ellpeck/actuallyadditions/tile/TileEntityInputter.java
View file

@ -209,7 +209,7 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt
if(tempStack.getMaxStackSize() < theInventory.getInventoryStackLimit()) maxSize = tempStack.getMaxStackSize(); if(tempStack.getMaxStackSize() < theInventory.getInventoryStackLimit()) maxSize = tempStack.getMaxStackSize();
else maxSize = theInventory.getInventoryStackLimit(); else maxSize = theInventory.getInventoryStackLimit();
} }
if((tempStack == null || (theInventory.isItemValidForSlot(i, this.slots[0]) && tempStack.isItemEqual(this.slots[0]) && tempStack.stackSize < maxSize)) && this.checkFilters(this.slots[0], false, isPutWhitelist)){ if(theInventory.isItemValidForSlot(i, this.slots[0]) && (tempStack == null || (tempStack.isItemEqual(this.slots[0]) && tempStack.stackSize < maxSize)) && this.checkFilters(this.slots[0], false, isPutWhitelist)){
if(theSided != null){ if(theSided != null){
for(int j = 0; j < 5; j++){ for(int j = 0; j < 5; j++){
if(theSided.canInsertItem(i, this.slots[0], j)){ if(theSided.canInsertItem(i, this.slots[0], j)){