Fixed crash on edge cases where the player suddenly doesn't have an item in it's main hand. (Fixes #1)

The 'blocking' attribute should update correctly for shields now.

Author: Sollace

Diff for: main-src/eu/ha3/matmos/game/data/modules/L__legacy_column.java

@@ -29,7 +29,7 @@ protected void doProcess()
 
 		setValue("y-1_as_number", MAtmosUtility.legacyOf(MAtmosUtility.getBlockAt(x, y - 1, z)));
 		setValue("y-2_as_number", MAtmosUtility.legacyOf(MAtmosUtility.getBlockAt(x, y - 2, z)));
-		setValue("y0_as_number", MAtmosUtility.legacyOf(MAtmosUtility.getBlockAt(x, y + 0, z)));
+		setValue("y0_as_number", MAtmosUtility.legacyOf(MAtmosUtility.getBlockAt(x, y, z)));
 		setValue("y1_as_number", MAtmosUtility.legacyOf(MAtmosUtility.getBlockAt(x, y + 1, z)));
 	}
 }

Diff for: main-src/eu/ha3/matmos/game/data/modules/M__ply_general.java

@@ -9,6 +9,7 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.item.ItemShield;
+import net.minecraft.item.ItemStack;
 
 /*
 --filenotes-placeholder
@@ -45,8 +46,11 @@ protected void doProcess()
             throw new RuntimeException(e);
         }
         setValue("on_ladder", player.isOnLadder());
-
-        setValue("blocking", player.isHandActive() && player.getHeldItemOffhand().getItem() instanceof ItemShield);
+        
+        ItemStack held = player.getHeldItemMainhand();
+        if (held == null) held = player.getHeldItemOffhand();
+        
+        setValue("blocking", player.isHandActive() && held != null && held.getItem() instanceof ItemShield);
         setValue("sprinting", player.isSprinting());
         setValue("sneaking", player.isSneaking());
         setValue("airborne", player.isAirBorne);

Diff for: main-src/eu/ha3/matmos/game/data/modules/S__ply_hitscan.java

@@ -48,15 +48,13 @@ protected void doProcess()
 		setValue("mouse_over_something", mc.objectMouseOver.typeOfHit != Type.MISS);
 		setValue("mouse_over_what", this.equiv.get(mc.objectMouseOver.typeOfHit));
         // dag edit -> getBlockPos().get..()
-		setValue(
-			"block",
+		setValue("block",
 			mc.objectMouseOver.typeOfHit == Type.BLOCK ? MAtmosUtility.getNameAt(
 				mc.objectMouseOver.getBlockPos().getX(), mc.objectMouseOver.getBlockPos().getY(),
                     mc.objectMouseOver.getBlockPos().getZ(),
 				MODULE_CONSTANTS.NO_BLOCK_OUT_OF_BOUNDS) : MODULE_CONSTANTS.NO_BLOCK_IN_THIS_CONTEXT);
         // dag edit -> getBlockPos().get..()
-		setValue(
-			"meta",
+		setValue("meta",
 			mc.objectMouseOver.typeOfHit == Type.BLOCK ? MAtmosUtility.getMetaAsStringAt(
 				mc.objectMouseOver.getBlockPos().getX(), mc.objectMouseOver.getBlockPos().getY(),
                     mc.objectMouseOver.getBlockPos().getZ(),