diff --git a/src/tconstruct/util/TEventHandler.java b/src/tconstruct/util/TEventHandler.java index e58586c0bf0..32c2535a8ab 100644 --- a/src/tconstruct/util/TEventHandler.java +++ b/src/tconstruct/util/TEventHandler.java @@ -410,28 +410,19 @@ else if (event.source.damageType.equals("player")) } } - /*if (!player.worldObj.getGameRules().getGameRuleBooleanValue("keepInventory")) + if (!player.worldObj.getGameRules().getGameRuleBooleanValue("keepInventory")) { TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.username); stats.armor.dropItems(); stats.knapsack.dropItems(); - }*/ + } } } @ForgeSubscribe public void onLivingDeath(LivingDeathEvent event) { - if (event.entityLiving instanceof EntityPlayer) - { - EntityPlayer player = (EntityPlayer) event.entityLiving; - if (!player.worldObj.getGameRules().getGameRuleBooleanValue("keepInventory")) - { - TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.username); - stats.armor.dropItems(); - stats.knapsack.dropItems(); - } - } + } void addDrops(LivingDropsEvent event, ItemStack dropStack) @@ -462,7 +453,7 @@ public void onLivingSpawn(LivingSpawnEvent.SpecialSpawn event) creeper.mountEntity(living.riddenByEntity); else creeper.mountEntity(living); - + EntityXPOrb orb = new EntityXPOrb(living.worldObj, living.posX, living.posY, living.posZ, random.nextInt(20) + 20); orb.mountEntity(creeper); }