diff options
| author | Loki Rautio <lokirautio@gmail.com> | 2026-03-04 03:56:03 -0600 |
|---|---|---|
| committer | Loki Rautio <lokirautio@gmail.com> | 2026-03-04 03:56:03 -0600 |
| commit | 42aec6dac53dffa6afe072560a7e1d4986112538 (patch) | |
| tree | 0836426857391df1b6a83f6368a183f83ec9b104 /Minecraft.World/EnchantmentHelper.h | |
| parent | c9d58eeac7c72f0b3038e084667b4d89a6249fce (diff) | |
| parent | ef9b6fd500dfabd9463267b0dd9e29577eea8a2b (diff) | |
Merge branch 'main' into pr/win64-world-saves
# Conflicts:
# Minecraft.Client/MinecraftServer.cpp
# README.md
Diffstat (limited to 'Minecraft.World/EnchantmentHelper.h')
| -rw-r--r-- | Minecraft.World/EnchantmentHelper.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/Minecraft.World/EnchantmentHelper.h b/Minecraft.World/EnchantmentHelper.h index 9f7de5c5..6ed2e398 100644 --- a/Minecraft.World/EnchantmentHelper.h +++ b/Minecraft.World/EnchantmentHelper.h @@ -49,14 +49,14 @@ private: * @return */ public: - static int getDamageProtection(shared_ptr<Inventory> inventory, DamageSource *source); + static int getDamageProtection(ItemInstanceArray armor, DamageSource *source); private: class GetDamageBonusIteration : public EnchantmentIterationMethod { public: - int sum; - shared_ptr<Mob> target; + float sum; + shared_ptr<LivingEntity> target; virtual void doEnchantment(Enchantment *enchantment, int level); }; @@ -70,18 +70,18 @@ private: * @return */ public: - static int getDamageBonus(shared_ptr<Inventory> inventory, shared_ptr<Mob> target); - static int getKnockbackBonus(shared_ptr<Inventory> inventory, shared_ptr<Mob> target); - static int getFireAspect(shared_ptr<Mob> source); - static int getOxygenBonus(shared_ptr<Inventory> inventory); - static int getDiggingBonus(shared_ptr<Inventory> inventory); - static int getDigDurability(shared_ptr<Inventory> inventory); - static bool hasSilkTouch(shared_ptr<Inventory> inventory); - static int getDiggingLootBonus(shared_ptr<Inventory> inventory); - static int getKillingLootBonus(shared_ptr<Inventory> inventory); - static bool hasWaterWorkerBonus(shared_ptr<Inventory> inventory); - static int getArmorThorns(shared_ptr<Mob> source); - static shared_ptr<ItemInstance> getRandomItemWith(Enchantment *enchantment, shared_ptr<Mob> source); + static float getDamageBonus(shared_ptr<LivingEntity> source, shared_ptr<LivingEntity> target); + static int getKnockbackBonus(shared_ptr<LivingEntity> source, shared_ptr<LivingEntity> target); + static int getFireAspect(shared_ptr<LivingEntity> source); + static int getOxygenBonus(shared_ptr<LivingEntity> source); + static int getDiggingBonus(shared_ptr<LivingEntity> source); + static int getDigDurability(shared_ptr<LivingEntity> source); + static bool hasSilkTouch(shared_ptr<LivingEntity> source); + static int getDiggingLootBonus(shared_ptr<LivingEntity> source); + static int getKillingLootBonus(shared_ptr<LivingEntity> source); + static bool hasWaterWorkerBonus(shared_ptr<LivingEntity> source); + static int getArmorThorns(shared_ptr<LivingEntity> source); + static shared_ptr<ItemInstance> getRandomItemWith(Enchantment *enchantment, shared_ptr<LivingEntity> source); /** * |