fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unike input events, tick events fire before the player is initialised, so add a check to stop it crashing with an NPE.

Browse Source
This commit is contained in:
Electroblob77
2019-01-04 21:53:39 +00:00
parent 53b29939f1
commit 5421372754
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/WizardryKeyHandler.java
+9 -5
View File
@@ -26,12 +26,16 @@ public class WizardryKeyHandler {
if(Wizardry.proxy instanceof ClientProxy){ if(Wizardry.proxy instanceof ClientProxy){
EntityPlayer player = Minecraft.getMinecraft().player; EntityPlayer player = Minecraft.getMinecraft().player;
ItemStack wand = player.getHeldItemMainhand();
if(!(wand.getItem() instanceof ItemWand)){ if(player != null){
wand = player.getHeldItemOffhand();
// If the player isn't holding a wand, then nothing else needs to be done. ItemStack wand = player.getHeldItemMainhand();
if(!(wand.getItem() instanceof ItemWand)) return;
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){ if(ClientProxy.NEXT_SPELL.isKeyDown() && Minecraft.getMinecraft().inGameHasFocus){