diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/server/game/Entities/GameObject/GameObject.cpp | 1 | ||||
-rw-r--r-- | src/server/game/Entities/Object/Object.cpp | 2 | ||||
-rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 2 | ||||
-rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 1 | ||||
-rw-r--r-- | src/server/game/Server/WorldSocket.cpp | 2 | ||||
-rw-r--r-- | src/server/game/Spells/Auras/SpellAuras.cpp | 1 | ||||
-rw-r--r-- | src/server/game/Time/UpdateTime.cpp | 2 | ||||
-rw-r--r-- | src/server/scripts/Spells/spell_item.cpp | 2 |
8 files changed, 10 insertions, 3 deletions
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 5091574de18..b2d88630aeb 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -117,6 +117,7 @@ GameObject::GameObject() : WorldObject(false), MapObject(), m_respawnTime = 0; m_respawnDelayTime = 300; m_despawnDelay = 0; + m_despawnRespawnTime = 0s; m_lootState = GO_NOT_READY; m_spawnedByDefault = true; m_usetimes = 0; diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 53fc92ed088..afdd4dcdd25 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -965,7 +965,7 @@ void MovementInfo::OutDebug() WorldObject::WorldObject(bool isWorldObject) : Object(), WorldLocation(), LastUsedScriptID(0), m_movementInfo(), m_name(), m_isActive(false), m_isFarVisible(false), m_isWorldObject(isWorldObject), m_zoneScript(nullptr), -m_transport(nullptr), m_zoneId(0), m_areaId(0), m_staticFloorZ(VMAP_INVALID_HEIGHT), m_currMap(nullptr), m_InstanceId(0), +m_transport(nullptr), m_zoneId(0), m_areaId(0), m_staticFloorZ(VMAP_INVALID_HEIGHT), m_outdoors(false), m_currMap(nullptr), m_InstanceId(0), m_phaseMask(PHASEMASK_NORMAL), m_notifyflags(0) { m_serverSideVisibility.SetValue(SERVERSIDE_VISIBILITY_GHOST, GHOST_VISIBILITY_ALIVE | GHOST_VISIBILITY_GHOST); diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 3268988ac83..edd1f85583c 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -15748,7 +15748,7 @@ bool Player::GiveQuestSourceItem(Quest const* quest) if (srcitem > 0) { // Don't give source item if it is the same item used to start the quest - ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(srcitem); + ItemTemplate const* itemTemplate = ASSERT_NOTNULL(sObjectMgr->GetItemTemplate(srcitem)); if (quest->GetQuestId() == itemTemplate->StartQuest) return true; diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 93092432ea0..5b2cdfd0b7e 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -10934,6 +10934,7 @@ bool Unit::InitTamedPet(Pet* pet, uint8 level, uint32 spell_id) else // creature died { TC_LOG_DEBUG("entities.unit", "DealDamageNotPlayer"); + ASSERT_NODEBUGINFO(creature); if (!creature->IsPet()) { diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp index 8b0c01db8ce..69d8be6c8b7 100644 --- a/src/server/game/Server/WorldSocket.cpp +++ b/src/server/game/Server/WorldSocket.cpp @@ -378,6 +378,7 @@ WorldSocket::ReadDataHandlerResult WorldSocket::ReadDataHandler() if (!_worldSession) { TC_LOG_ERROR("network.opcode", "ProcessIncoming: Client not authed opcode = %u", uint32(opcode)); + delete packetToQueue; return ReadDataHandlerResult::Error; } @@ -385,6 +386,7 @@ WorldSocket::ReadDataHandlerResult WorldSocket::ReadDataHandler() if (!handler) { TC_LOG_ERROR("network.opcode", "No defined handler for opcode %s sent by %s", GetOpcodeNameForLogging(static_cast<OpcodeClient>(packet.GetOpcode())).c_str(), _worldSession->GetPlayerInfo().c_str()); + delete packetToQueue; return ReadDataHandlerResult::Error; } diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index f955ee68b81..e50e90ebfbc 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -2714,6 +2714,7 @@ DynObjAura::DynObjAura(AuraCreateInfo const& createInfo) LoadScripts(); ASSERT(GetDynobjOwner()); ASSERT(GetDynobjOwner()->IsInWorld()); + ASSERT(createInfo.Caster); ASSERT(GetDynobjOwner()->GetMap() == createInfo.Caster->GetMap()); _InitEffects(createInfo._auraEffectMask, createInfo.Caster, createInfo.BaseAmount); GetDynobjOwner()->SetAura(this); diff --git a/src/server/game/Time/UpdateTime.cpp b/src/server/game/Time/UpdateTime.cpp index f4ac1d96c4b..ef8ec5ce1fa 100644 --- a/src/server/game/Time/UpdateTime.cpp +++ b/src/server/game/Time/UpdateTime.cpp @@ -49,6 +49,8 @@ uint32 UpdateTime::GetTimeWeightedAverageUpdateTime() const sum += diff * diff; weightsum += diff; } + if (weightsum == 0) + return 0; return sum / weightsum; } diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index 4709db47f59..8391e293c40 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -3729,7 +3729,7 @@ class spell_item_mirrens_drinking_hat : public SpellScript void HandleScriptEffect(SpellEffIndex /* effIndex */) { - uint32 spellId; + uint32 spellId = 0; switch (urand(1, 6)) { case 1: |