aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRat <gmstreetrat@gmail.com>2015-04-06 12:14:25 +0200
committerRat <gmstreetrat@gmail.com>2015-04-06 12:14:25 +0200
commit23e8a3ce2928458649d94408d5deffb67339b1d6 (patch)
treefbf236a23c94037ec0f389cb5d9131d4ee09f37e
parent449ae2b00edc45aa3ed98277a9cb8f897ea55a1c (diff)
Core/GameObjects: fixed typo and logic (0 is a valid invisibility type)
-rw-r--r--src/server/game/Entities/GameObject/GameObject.cpp2
-rw-r--r--src/server/game/Globals/ObjectMgr.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index 4d419ac1e97..232ee898739 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -299,7 +299,7 @@ bool GameObject::Create(ObjectGuid::LowType guidlow, uint32 name_id, Map* map, u
if (GameObjectAddon const* addon = sObjectMgr->GetGameObjectAddon(guidlow))
{
- if (addon->InvisibilityType && addon->InvisibilityValue)
+ if (addon->InvisibilityValue)
{
m_invisibility.AddFlag(addon->InvisibilityType);
m_invisibility.AddValue(addon->InvisibilityType, addon->InvisibilityValue);
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index bd32f0b70ea..1b36a085cd4 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -1111,7 +1111,7 @@ void ObjectMgr::LoadGameObjectAddons()
GameObjectAddon& gameObjectAddon = _gameObjectAddonStore[guid];
gameObjectAddon.InvisibilityType = InvisibilityType(fields[1].GetUInt8());
- gameObjectAddon.InvisibilityValue = InvisibilityType(fields[2].GetUInt32());
+ gameObjectAddon.InvisibilityValue = fields[2].GetUInt32();
if (gameObjectAddon.InvisibilityType >= TOTAL_INVISIBILITY_TYPES)
{