backups/neoLegacy
2
0
Fork 0
mirror of https://github.com/neoStudiosLCE/neoLegacy.git synced 2026-08-20 09:57:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into feat/minigames

Browse source
This commit is contained in:
github-actions 2026-05-25 00:17:54 +00:00
parent be0114511b e1383cc6a3
commit f0429a9ee3
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Minecraft.World/MobEffect.cpp
View file

@ -137,9 +137,13 @@ void MobEffect::applyEffectTick(shared_ptr<LivingEntity> mob, int amplification)
} }
else if (id == poison->id) else if (id == poison->id)
{ {
if (mob->getHealth() > 1.0f) // poison must never reduce health below 1 hp
// if the current health is between 1 and 2 hp the player is left at exactly 1 HP rather than dying.
float currentHealth = mob->getHealth();
if (currentHealth > 1.0f)
{ {
mob->hurt(DamageSource::magic, 1.0f); float poisonDmg = min(1.0f, currentHealth - 1.0f);
mob->hurt(DamageSource::magic, poisonDmg);
} }
} }
else if (id == wither->id) else if (id == wither->id)