Minor fixes

NPE checks
SquidDev-CC · Mar 5, 2016 · 0dc4854 · 0dc4854
1 parent b59c027
commit 0dc4854
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/main/java/org/squiddev/cctweaks/core/network/bridge/NetworkBinding.java b/src/main/java/org/squiddev/cctweaks/core/network/bridge/NetworkBinding.java
@@ -127,8 +127,6 @@ public boolean load(NBTTagCompound tag) {
 		if (tag.hasKey(ID)) {
 			setId(tag.getInteger(ID));
 			loaded = true;
-		} else {
-			removeId();
 		}
 
 		return loaded;

diff --git a/src/main/java/org/squiddev/cctweaks/turtle/ToolManipulatorPeripheral.java b/src/main/java/org/squiddev/cctweaks/turtle/ToolManipulatorPeripheral.java
@@ -350,7 +350,7 @@ public Object[] execute() throws LuaException {
 						boolean result = TurtleRegistry.instance.canSwing(access, player, stack, direction, hit);
 						if (result) return new Object[]{true};
 
-						if (hit.entityHit != null) {
+						if (hit != null && hit.entityHit != null) {
 							@SuppressWarnings("unchecked") Multimap<String, AttributeModifier> map = stack.getAttributeModifiers();
 							for (AttributeModifier modifier : map.get(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName())) {
 								if (modifier.getAmount() > 0) {
@@ -360,7 +360,7 @@ public Object[] execute() throws LuaException {
 						}
 					}
 
-					if (hit.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) {
+					if (hit != null && hit.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) {
 						Block block = access.getWorld().getBlockState(hit.getBlockPos()).getBlock();
 						if (block.canHarvestBlock(access.getWorld(), hit.getBlockPos(), player)) {
 							return new Object[]{true};