fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

First batch of null -> isEmpty() checks.

Browse Source 
I most likely still missed a ton of checks...
This commit is contained in:
Gunther De Wachter
2017-06-26 05:15:25 +02:00
parent 370fc49357
commit da5879b667
117 changed files with 594 additions and 570 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/container/slot/SlotInaccessible.java
+4 -4
View File
@@ -27,7 +27,7 @@ import net.minecraft.item.ItemStack;
public class SlotInaccessible extends AppEngSlot
{
private ItemStack dspStack = null;
private ItemStack dspStack = ItemStack.EMPTY;
public SlotInaccessible( final IInventory i, final int slotIdx, final int x, final int y )
{
@@ -44,7 +44,7 @@ public class SlotInaccessible extends AppEngSlot
public void onSlotChanged()
{
super.onSlotChanged();
this.dspStack = null;
this.dspStack = ItemStack.EMPTY;
}
@Override
@@ -56,10 +56,10 @@ public class SlotInaccessible extends AppEngSlot
@Override
public ItemStack getDisplayStack()
{
if( this.dspStack == null )
if( this.dspStack.isEmpty() )
{
final ItemStack dsp = super.getDisplayStack();
if( dsp != null )
if( !dsp.isEmpty() )
{
this.dspStack = dsp.copy();
}