Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11
# Conflicts: # build.gradle # src/main/java/techreborn/blocks/BlockRubberLog.java # src/main/java/techreborn/init/ModRecipes.java # src/main/java/techreborn/items/tools/ItemElectricTreetap.java # src/main/java/techreborn/items/tools/ItemTreeTap.java
This commit is contained in:
commit
c1d2e875bf
4 changed files with 54 additions and 3 deletions
|
@ -75,7 +75,7 @@ public class TileEnergyStorage extends TilePowerAcceptor implements IWrenchable,
|
|||
}
|
||||
IEnergyItemInfo item = (IEnergyItemInfo) stack.getItem();
|
||||
if (item.canProvideEnergy(stack)) {
|
||||
if (getEnergy() != getMaxPower()) {
|
||||
if (getEnergy() != getMaxPower() && PoweredItem.getEnergy(stack) > 0) {
|
||||
addEnergy(item.getMaxTransfer(stack));
|
||||
PoweredItem.setEnergy(PoweredItem.getEnergy(stack) - item.getMaxTransfer(stack), stack);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue