diff options
| author | TheJumper <maximilian.springer@web.de> | 2014-02-23 19:35:56 +0100 |
|---|---|---|
| committer | TheJumper <maximilian.springer@web.de> | 2014-02-23 19:35:56 +0100 |
| commit | 2f59517023765e8f5d5555adacafd146729ab071 (patch) | |
| tree | bb5202265e994a69e16041a86e8199563ee6e940 /src/Mobs/Zombie.cpp | |
| parent | Added static Enchantment Constants, Replaced cryptic Looting ID (diff) | |
| download | cuberite-2f59517023765e8f5d5555adacafd146729ab071.tar cuberite-2f59517023765e8f5d5555adacafd146729ab071.tar.gz cuberite-2f59517023765e8f5d5555adacafd146729ab071.tar.bz2 cuberite-2f59517023765e8f5d5555adacafd146729ab071.tar.lz cuberite-2f59517023765e8f5d5555adacafd146729ab071.tar.xz cuberite-2f59517023765e8f5d5555adacafd146729ab071.tar.zst cuberite-2f59517023765e8f5d5555adacafd146729ab071.zip | |
Diffstat (limited to 'src/Mobs/Zombie.cpp')
| -rw-r--r-- | src/Mobs/Zombie.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/Mobs/Zombie.cpp b/src/Mobs/Zombie.cpp index 6a007683b..f19e096ee 100644 --- a/src/Mobs/Zombie.cpp +++ b/src/Mobs/Zombie.cpp @@ -23,18 +23,19 @@ cZombie::cZombie(bool a_IsVillagerZombie) : void cZombie::GetDrops(cItems & a_Drops, cEntity * a_Killer) { - int LootingLevel = a_Killer->GetEquippedWeapon().m_Enchantments.GetLevel(E_ENCHANTMENT_LOOTING); + int LootingLevel = 0; + if (a_Killer != NULL) + { + LootingLevel = a_Killer->GetEquippedWeapon().m_Enchantments.GetLevel(cEnchantments::enchLooting); + } AddRandomDropItem(a_Drops, 0, 2 + LootingLevel, E_ITEM_ROTTEN_FLESH); cItems RareDrops; RareDrops.Add(cItem(E_ITEM_IRON)); RareDrops.Add(cItem(E_ITEM_CARROT)); RareDrops.Add(cItem(E_ITEM_POTATO)); - if (!GetEquippedHelmet().IsEmpty()) RareDrops.Add(GetEquippedHelmet()); - if (!GetEquippedChestplate().IsEmpty()) RareDrops.Add(GetEquippedChestplate()); - if (!GetEquippedLeggings().IsEmpty()) RareDrops.Add(GetEquippedLeggings()); - if (!GetEquippedBoots().IsEmpty()) RareDrops.Add(GetEquippedBoots()); - if (!GetEquippedWeapon().IsEmpty()) RareDrops.Add(GetEquippedWeapon()); AddRandomRareDropItem(a_Drops, RareDrops, LootingLevel); + AddRandomArmorDropItem(a_Drops, LootingLevel); + AddRandomWeaponDropItem(a_Drops, LootingLevel); } |