aboutsummaryrefslogtreecommitdiff
path: root/src/content
diff options
context:
space:
mode:
authorrubenwardy <rw@rubenwardy.com>2019-03-12 07:56:56 +0000
committerLoïc Blot <nerzhul@users.noreply.github.com>2019-03-12 08:56:56 +0100
commit1e3e4fb6492832048b484ffe784613a16713f1d2 (patch)
tree672f8699f84afba9bd238bd5a0173e175d1ab260 /src/content
parent3b25b807f33bff885bd840ec0dc9e2d95b392f81 (diff)
downloadhax-minetest-server-1e3e4fb6492832048b484ffe784613a16713f1d2.tar.gz
hax-minetest-server-1e3e4fb6492832048b484ffe784613a16713f1d2.zip
HPChange Reason: Fix push after free, and type being overwritten (#8359)
* HPChange Reason: Fix push after free, and type being overwritten Fixes #8227 and #8344
Diffstat (limited to '')
-rw-r--r--src/content_sao.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/content_sao.h b/src/content_sao.h
index 14f959e30..f54bc16c2 100644
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -405,6 +405,11 @@ struct PlayerHPChangeReason {
bool from_mod = false;
int lua_reference = -1;
+ inline bool hasLuaReference() const
+ {
+ return lua_reference >= 0;
+ }
+
bool setTypeFromString(const std::string &typestr)
{
if (typestr == "set_hp")