diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index d6d3d08ff4..8b89e9bf23 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -2959,14 +2959,14 @@ std::vector const* GameObject::GetPauseTimes() const void GameObject::SetPathProgressForClient(float progress) { - bool hasPendingUpdate = _changesMask.GetBit(GAMEOBJECT_DYNAMIC); + bool marked = _changesMask.GetBit(GAMEOBJECT_DYNAMIC); uint32 dynamicFlags = GetUInt32Value(GAMEOBJECT_DYNAMIC); dynamicFlags &= 0xFFFF; // remove high bits dynamicFlags |= uint32(progress * 65535.0f) << 16; UpdateUInt32Value(GAMEOBJECT_DYNAMIC, dynamicFlags); - if (!hasPendingUpdate) + if (!marked) _changesMask.UnsetBit(GAMEOBJECT_DYNAMIC); } diff --git a/src/server/game/Events/GameEventSender.cpp b/src/server/game/Events/GameEventSender.cpp index db5c31b8dc..cd150a21d3 100644 --- a/src/server/game/Events/GameEventSender.cpp +++ b/src/server/game/Events/GameEventSender.cpp @@ -27,8 +27,6 @@ void GameEvents::Trigger(uint32 gameEventId, WorldObject* source, WorldObject* target) { - return; - ASSERT(source || target, "At least one of [source] or [target] must be provided"); WorldObject* refForMapAndZoneScript = Coalesce(source, target); @@ -41,12 +39,15 @@ void GameEvents::Trigger(uint32 gameEventId, WorldObject* source, WorldObject* t zoneScript->ProcessEvent(target, gameEventId, source); Map* map = refForMapAndZoneScript->GetMap(); - if (GameObject* goTarget = target->ToGameObject()) - if (GameObjectAI* goAI = goTarget->AI()) - goAI->EventInform(gameEventId); - if (Player* sourcePlayer = source->ToPlayer()) - TriggerForPlayer(gameEventId, sourcePlayer); + if (target && target->IsGameObject()) + if (GameObject* goTarget = target->ToGameObject()) + if (GameObjectAI* goAI = goTarget->AI()) + goAI->EventInform(gameEventId); + + if (source && source->IsPlayer()) + if (Player* sourcePlayer = source->ToPlayer()) + TriggerForPlayer(gameEventId, sourcePlayer); TriggerForMap(gameEventId, map, source, target); }