From 5421372754764c08a7bfb6c84efd12c4b0e9bad2 Mon Sep 17 00:00:00 2001
From: Electroblob77 <35599699+Electroblob77@users.noreply.github.com>
Date: Fri, 4 Jan 2019 21:53:39 +0000
Subject: [PATCH] Unike input events, tick events fire before the player is
 initialised, so add a check to stop it crashing with an NPE.

---
 .../electroblob/wizardry/WizardryKeyHandler.java   | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/java/electroblob/wizardry/WizardryKeyHandler.java b/src/main/java/electroblob/wizardry/WizardryKeyHandler.java
index d43f94b3..b3fe5cfb 100644
--- a/src/main/java/electroblob/wizardry/WizardryKeyHandler.java
+++ b/src/main/java/electroblob/wizardry/WizardryKeyHandler.java
@@ -26,12 +26,16 @@ public class WizardryKeyHandler {
 		if(Wizardry.proxy instanceof ClientProxy){
 
 			EntityPlayer player = Minecraft.getMinecraft().player;
-			ItemStack wand = player.getHeldItemMainhand();
 
-			if(!(wand.getItem() instanceof ItemWand)){
-				wand = player.getHeldItemOffhand();
-				// If the player isn't holding a wand, then nothing else needs to be done.
-				if(!(wand.getItem() instanceof ItemWand)) return;
+			if(player != null){
+
+				ItemStack wand = player.getHeldItemMainhand();
+
+				if(!(wand.getItem() instanceof ItemWand)){
+					wand = player.getHeldItemOffhand();
+					// If the player isn't holding a wand, then nothing else needs to be done.
+					if(!(wand.getItem() instanceof ItemWand)) return;
+				}
 			}
 
 			if(ClientProxy.NEXT_SPELL.isKeyDown() && Minecraft.getMinecraft().inGameHasFocus){