aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/DamageEnchantment.cpp
diff options
context:
space:
mode:
authorLoki Rautio <lokirautio@gmail.com>2026-03-04 03:56:03 -0600
committerLoki Rautio <lokirautio@gmail.com>2026-03-04 03:56:03 -0600
commit42aec6dac53dffa6afe072560a7e1d4986112538 (patch)
tree0836426857391df1b6a83f6368a183f83ec9b104 /Minecraft.World/DamageEnchantment.cpp
parentc9d58eeac7c72f0b3038e084667b4d89a6249fce (diff)
parentef9b6fd500dfabd9463267b0dd9e29577eea8a2b (diff)
Merge branch 'main' into pr/win64-world-saves
# Conflicts: # Minecraft.Client/MinecraftServer.cpp # README.md
Diffstat (limited to 'Minecraft.World/DamageEnchantment.cpp')
-rw-r--r--Minecraft.World/DamageEnchantment.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Minecraft.World/DamageEnchantment.cpp b/Minecraft.World/DamageEnchantment.cpp
index 686abc62..ce5a7c1f 100644
--- a/Minecraft.World/DamageEnchantment.cpp
+++ b/Minecraft.World/DamageEnchantment.cpp
@@ -27,19 +27,19 @@ int DamageEnchantment::getMaxLevel()
return 5;
}
-int DamageEnchantment::getDamageBonus(int level, shared_ptr<Mob> target)
+float DamageEnchantment::getDamageBonus(int level, shared_ptr<LivingEntity> target)
{
if (type == ALL)
{
- return Mth::floor(level * 2.75f);
+ return level *1.25f;
}
if (type == UNDEAD && target->getMobType() == UNDEAD)
{
- return Mth::floor(level * 4.5f);
+ return level * 2.5f;
}
if (type == ARTHROPODS && target->getMobType() == ARTHROPOD)
{
- return Mth::floor(level * 4.5f);
+ return level * 2.5f;
}
return 0;
}