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/debug/TileCubeGenerator.java
+4 -4
View File
@@ -37,14 +37,14 @@ public class TileCubeGenerator extends AEBaseTile implements ITickable
{
private int size = 3;
private ItemStack is = null;
private ItemStack is = ItemStack.EMPTY;
private int countdown = 20 * 10;
private EntityPlayer who = null;
@Override
public void update()
{
if( this.is != null && Platform.isServer() )
if( !this.is.isEmpty() && Platform.isServer() )
{
this.countdown--;
@@ -92,9 +92,9 @@ public class TileCubeGenerator extends AEBaseTile implements ITickable
final ItemStack hand = player.inventory.getCurrentItem();
this.who = player;
if( hand == null )
if( hand.isEmpty() )
{
this.is = null;
this.is = ItemStack.EMPTY;
if( player.isSneaking() )
{
src/main/java/appeng/debug/TileItemGen.java
+5 -1
View File
@@ -23,6 +23,7 @@ import java.util.LinkedList;
import java.util.Queue;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -78,7 +79,10 @@ public class TileItemGen extends AEBaseTile implements IInventory
private ItemStack getRandomItem()
{
return POSSIBLE_ITEMS.peek();
// Safeguard for crash
ItemStack testStack = POSSIBLE_ITEMS.peek();
if( testStack.isEmpty() ) testStack = new ItemStack(Blocks.COBBLESTONE, 1);
return testStack;
}
@Override