From 40ddee60c7ee8ddded7c948a70086b55e71ac80c Mon Sep 17 00:00:00 2001 From: Qiuzhizhe <42761326+quizhizhe@users.noreply.github.com> Date: Fri, 28 Oct 2022 11:13:35 -0700 Subject: [PATCH] Fix return cause --- ScriptEngine/API/EventAPI.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ScriptEngine/API/EventAPI.cpp b/ScriptEngine/API/EventAPI.cpp index 75a57ee..f3c5b1a 100644 --- a/ScriptEngine/API/EventAPI.cpp +++ b/ScriptEngine/API/EventAPI.cpp @@ -765,10 +765,9 @@ void EnableEventListener(int eventId) { else source = Level::getEntity(ev.mDamageSource->getDamagingEntityUniqueID()); } - //TODO 此处的伤害无法获取 CallEvent(EVENT_TYPES::onMobHurt, EntityClass::newEntity(ev.mMob), source ? EntityClass::newEntity(source) : Local(), - float(ev.mDamage), Number::newNumber(0)); + float(ev.mDamage), Number::newNumber((int)ev.mDamageSource->getCause())); } IF_LISTENED_END(EVENT_TYPES::onMobHurt) }); @@ -792,9 +791,8 @@ void EnableEventListener(int eventId) { if (ev.mDamageSource->isChildEntitySource()) source = source->getOwner(); } - //TODO 此处的伤害无法获取 CallEvent(EVENT_TYPES::onMobDie, EntityClass::newEntity((Actor*)ev.mMob), - (source ? EntityClass::newEntity(source) : Local()), Number::newNumber(0)); + (source ? EntityClass::newEntity(source) : Local()), Number::newNumber((int)ev.mDamageSource->getCause())); } IF_LISTENED_END(EVENT_TYPES::onMobDie); });