mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Merge branch '1.11' of https://github.com/aidancbrady/Mekanism into 1.11
# By Xander Victory # Via GitHub (1) and Xander Victory (1) * '1.11' of https://github.com/aidancbrady/Mekanism: more !isEmpty checks to validate ItemStacks more !isEmpty checks to validate ItemStacks add @Nullable to internal ItemStack fields and also make sure they're not IS.isEmpty() Fix some more null ItemStacks found with Idea
This commit is contained in:
commit
398f0284a8
25 files changed
+71
-61
No files matched your search
@@ -220,7 +220,7 @@ abstract class BasicEnergyTile implements ILocatable, IEnergyTile {
|
||||
* @return true if energy was transferred
|
||||
*/
|
||||
public boolean charge(ItemStack stack) {
|
||||
if (stack == null || !Info.isIc2Available() || getWorldObj().isRemote) return false;
|
||||
if (stack == null || stack.isEmpty() || !Info.isIc2Available() || getWorldObj().isRemote) return false;
|
||||
|
||||
double amount = ElectricItem.manager.charge(stack, energyStored, Math.max(getSinkTier(), getSourceTier()), false, false);
|
||||
|
||||
@@ -237,7 +237,7 @@ abstract class BasicEnergyTile implements ILocatable, IEnergyTile {
|
||||
* @return true if energy was transferred
|
||||
*/
|
||||
public boolean discharge(ItemStack stack, double limit) {
|
||||
if (stack == null || !Info.isIc2Available() || getWorldObj().isRemote) return false;
|
||||
if (stack == null || stack.isEmpty() || !Info.isIc2Available() || getWorldObj().isRemote) return false;
|
||||
|
||||
double amount = capacity - energyStored;
|
||||
if (amount <= 0) return false;
|
||||
|
||||
Reference in new issue
Block a user