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/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 | 
7 files changed, 8 insertions, 3 deletions
| diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index ea6f340863a..c8a7d9d71a1 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -123,6 +123,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 9feb2fb30ea..4e9aedf271d 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -796,7 +796,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),  _dbPhase(0), 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 048837d053c..83b31c474ec 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -16323,7 +16323,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->GetStartQuest())              return true; diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 837cbc9d15c..ac93996b16c 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -10471,6 +10471,7 @@ void Unit::SetMeleeAnimKitId(uint16 animKitId)      else                                                // creature died      {          TC_LOG_DEBUG("entities.unit", "DealDamageNotPlayer"); +        ASSERT_NODEBUGINFO(creature);          if (!creature->IsPet())          { diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 9e29beb66a8..2bf12a82313 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -2522,6 +2522,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 6f3f5d6ff83..c4dada2853e 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 428dd4f7280..da9c104ad3f 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -3672,7 +3672,7 @@ class spell_item_mirrens_drinking_hat : public SpellScript      void HandleScriptEffect(SpellEffIndex /*effIndex*/)      { -        uint32 spellId; +        uint32 spellId = 0;          switch (urand(1, 6))          {              case 1: | 
