diff options
| author | daoge <3523206925@qq.com> | 2026-03-03 03:04:10 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-03 03:04:10 +0800 |
| commit | b3feddfef372618c8a9d7a0abcaf18cfad866c18 (patch) | |
| tree | 267761c3bb39241ba5c347bfbe2254d06686e287 /Minecraft.World/EnchantmentHelper.h | |
| parent | 84c31a2331f7a0ec85b9d438992e244f60e5020f (diff) | |
feat: TU19 (Dec 2014) Features & Content (#155)
* try to resolve merge conflict
* feat: TU19 (Dec 2014) Features & Content (#32)
* December 2014 files
* Working release build
* Fix compilation issues
* Add sound to Windows64Media
* Add DLC content and force Tutorial DLC
* Revert "Add DLC content and force Tutorial DLC"
This reverts commit 97a43994725008e35fceb984d5549df9c8cea470.
* Disable broken light packing
* Disable breakpoint during DLC texture map load
Allows DLC loading but the DLC textures are still broken
* Fix post build not working
* ...
* fix vs2022 build
* fix cmake build
---------
Co-authored-by: Loki <lokirautio@gmail.com>
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); /** * |