December 2014 files

This commit is contained in:
Loki Rautio
2026-03-01 11:00:23 -06:00
parent b691c43c44
commit 8fd3ac6e37
2049 changed files with 260190 additions and 134787 deletions

View File

@@ -52,7 +52,7 @@ int ThornsEnchantment::getDamage(int level, Random *random)
}
}
void ThornsEnchantment::doThornsAfterAttack(shared_ptr<Entity> source, shared_ptr<Mob> target, Random *random)
void ThornsEnchantment::doThornsAfterAttack(shared_ptr<Entity> source, shared_ptr<LivingEntity> target, Random *random)
{
int level = EnchantmentHelper::getArmorThorns(target);
shared_ptr<ItemInstance> item = EnchantmentHelper::getRandomItemWith(Enchantment::thorns, target);
@@ -64,14 +64,14 @@ void ThornsEnchantment::doThornsAfterAttack(shared_ptr<Entity> source, shared_pt
if (item != NULL)
{
item->hurt(3, target);
item->hurtAndBreak(3, target);
}
}
else
{
if (item != NULL)
{
item->hurt(1, target);
item->hurtAndBreak(1, target);
}
}
}