If Player is null, key context is invalid. ( #269 )

ChiselsAndBits · May 23, 2017 · b4a5374 · b4a5374
1 parent 0aa7004
commit b4a5374
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/main/java/mod/chiselsandbits/client/ModConflictContext.java b/src/main/java/mod/chiselsandbits/client/ModConflictContext.java
@@ -8,6 +8,7 @@
 import mod.chiselsandbits.core.ClientSide;
 import mod.chiselsandbits.helpers.ChiselToolType;
 import mod.chiselsandbits.interfaces.IVoxelBlobItem;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumHand;
@@ -125,7 +126,14 @@ public void setItemActive(
 	@Override
 	public boolean isActive()
 	{
-		final ItemStack held = ClientSide.instance.getPlayer().getHeldItemMainhand();
+		EntityPlayer player = ClientSide.instance.getPlayer();
+
+		if ( player == null )
+		{
+			return false;
+		}
+
+		final ItemStack held = player.getHeldItemMainhand();
 
 		if ( held == null )
 		{