From 0e439b2fa3f0ba4f3352273519c32ebc9c3a680e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= <34514239+appgurueu@users.noreply.github.com> Date: Sat, 13 Aug 2022 16:35:41 +0200 Subject: [PATCH] Check hp_max > 0 for entities (#12667) --- src/script/common/c_content.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp index 166980025..fafb2edc9 100644 --- a/src/script/common/c_content.cpp +++ b/src/script/common/c_content.cpp @@ -196,6 +196,9 @@ void read_object_properties(lua_State *L, int index, int hp_max = 0; if (getintfield(L, -1, "hp_max", hp_max)) { prop->hp_max = (u16)rangelim(hp_max, 0, U16_MAX); + // hp_max = 0 is sometimes used as a hack to keep players dead, only validate for entities + if (prop->hp_max == 0 && sao->getType() != ACTIVEOBJECT_TYPE_PLAYER) + throw LuaError("The hp_max property may not be 0 for entities!"); if (prop->hp_max < sao->getHP()) { PlayerHPChangeReason reason(PlayerHPChangeReason::SET_HP_MAX);