Add new environmental death hook

-Update Eluna Submodule
Niam5 · Oct 13, 2023 · 293d46a · 293d46a
1 parent 137b1b5
commit 293d46a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/game/Entities/Player.cpp b/src/game/Entities/Player.cpp
@@ -1004,6 +1004,11 @@ uint32 Player::EnvironmentalDamage(EnviromentalDamage type, uint32 damage)
 
     uint32 final_damage = DealDamage(this, damage, nullptr, damageType, SPELL_SCHOOL_MASK_NORMAL, nullptr, false);
 
+#ifdef BUILD_ELUNA
+    if (!IsAlive())
+        sEluna->OnPlayerKilledByEnvironment(this, type);
+#endif
+
     if (!IsAlive())
     {
         if (type == DAMAGE_FALL)                            // DealDamage not apply item durability loss at self damage

diff --git a/src/game/LuaEngine b/src/game/LuaEngine
+1 −1		.github/workflows/build.yml
+1 −1		CMangos/GlobalMethods.h
+1 −1		Hooks.h
+1 −0		LuaEngine.h
+1 −1		Mangos/GlobalMethods.h
+6 −2		Mangos/PlayerMethods.h
+1 −5		Mangos/UnitMethods.h
+8 −0		PlayerHooks.cpp
+1 −2		README.md
+1 −1		TrinityCore/GlobalMethods.h
+1 −1		TrinityCore/GroupMethods.h
+4 −0		TrinityCore/UnitMethods.h