Fix fake player NPE (as found by Soaryn)

SlimeKnights · Sep 8, 2013 · 802fb3a · 802fb3a
1 parent 0b4ab68
commit 802fb3a
Showing 1 changed file with 10 additions and 16 deletions.
diff --git a/src/tconstruct/util/TEventHandler.java b/src/tconstruct/util/TEventHandler.java
@@ -1,21 +1,13 @@
 package tconstruct.util;
 
-import java.util.ArrayList;
-import java.util.Random;
-
 import net.minecraft.block.Block;
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.EntityLivingData;
 import net.minecraft.entity.boss.EntityWither;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.item.EntityXPOrb;
-import net.minecraft.entity.monster.EntityCreeper;
-import net.minecraft.entity.monster.EntityGhast;
-import net.minecraft.entity.monster.EntitySkeleton;
-import net.minecraft.entity.monster.EntitySpider;
-import net.minecraft.entity.monster.EntityZombie;
-import net.minecraft.entity.monster.IMob;
+import net.minecraft.entity.monster.*;
 import net.minecraft.entity.passive.EntityChicken;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
@@ -46,14 +38,13 @@
 import tconstruct.library.crafting.ToolBuilder;
 import tconstruct.library.event.PartBuilderEvent;
 import tconstruct.library.event.ToolCraftEvent;
-import tconstruct.library.tools.ArrowMaterial;
-import tconstruct.library.tools.BowMaterial;
-import tconstruct.library.tools.BowstringMaterial;
-import tconstruct.library.tools.FletchingMaterial;
-import tconstruct.library.tools.ToolCore;
+import tconstruct.library.tools.*;
 import tconstruct.modifiers.ModAttack;
 import tconstruct.util.player.TPlayerStats;
 
+import java.util.ArrayList;
+import java.util.Random;
+
 public class TEventHandler
 {
     Random random = new Random();
@@ -413,8 +404,11 @@ else if (event.source.damageType.equals("player"))
             if (!player.worldObj.getGameRules().getGameRuleBooleanValue("keepInventory"))
             {
                 TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.username);
-                stats.armor.dropItems();
-                stats.knapsack.dropItems();
+                if (stats != null)
+                {
+                    stats.armor.dropItems();
+                    stats.knapsack.dropItems();
+                }
             }
         }
     }