upstream/MagicBees
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/MagicBees.git synced 2026-11-13 00:37:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'SST-03/patch-1' into dev

Browse Source 
# Conflicts:
#	dependencies.gradle
This commit is contained in:
Martin Robertz committed 2025-10-02 01:15:23 +02:00
2 parents 60607bc521 7ce76d77cd
commit d97b462cdc
1 file changed
+6 -8
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/magicbees/tileentity/TileEntityApimancersDrainerCommon.java
+6 -8
View File
@@ -159,7 +159,7 @@ public class TileEntityApimancersDrainerCommon extends TileEntity
this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord);
}
if (this.essentia.getAmount(tag) >= amount) {
this.essentia.reduce(tag, amount);
this.essentia.remove(tag, amount);
return true;
}
return false;
@@ -177,7 +177,7 @@ public class TileEntityApimancersDrainerCommon extends TileEntity
}
if (hasIt) {
for (Aspect next : ot.aspects.keySet()) {
essentia.reduce(next, ot.getAmount(next));
essentia.remove(next, ot.getAmount(next));
}
return true;
}
@@ -224,12 +224,10 @@ public class TileEntityApimancersDrainerCommon extends TileEntity
if (!this.worldObj.isRemote) {
this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord);
}
if (amount > this.essentia.getAmount(aspect)) {
int total = this.essentia.getAmount(aspect);
this.essentia.reduce(aspect, total);
return total;
}
this.essentia.reduce(aspect, amount);
int total = this.essentia.getAmount(aspect);
this.essentia.remove(aspect, amount); // if amount >= total then it will also remove aspect.
if (amount > total) return total;
return amount;
}
return 0;