From a3d3042049eed9f9070dcb299d1e4693628643c2 Mon Sep 17 00:00:00 2001 From: Rochet2 Date: Wed, 20 Jun 2018 01:38:32 +0300 Subject: [PATCH] Core Hook - Remove temporary fix and document possible null in hook (#805) * Remove workaround Partially revert temporary crash fix https://github.com/azerothcore/azerothcore-wotlk/commit/a36e94a49a5b3bbdf01c622600c87da8cf55a26b * Update ScriptMgr.h --- src/server/game/Entities/Object/Object.cpp | 2 -- src/server/game/Scripting/ScriptMgr.h | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 98cac7cd9..15be17a5a 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -76,8 +76,6 @@ Object::Object() : m_PackGUID(sizeof(uint64)+1) m_inWorld = false; m_objectUpdated = false; - CustomData.Set("base",new DataMap::Base); // avoid crash when access not initialized CustomData - m_PackGUID.appendPackGUID(0); } diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index d3ac6c396..ac94a0fdf 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -445,6 +445,7 @@ public: virtual void OnDamage(Unit* /*attacker*/, Unit* /*victim*/, uint32& /*damage*/) { } // Called when DoT's Tick Damage is being Dealt + // Attacker can be NULL if he is despawned while the aura still exists on target virtual void ModifyPeriodicDamageAurasTick(Unit* /*target*/, Unit* /*attacker*/, uint32& /*damage*/) { } // Called when Melee Damage is being Dealt