*Wintergrasp: Set Faction on workshop capture + GO check faction fix, by Spp

--HG--
branch : trunk

1 files changed, 1 insertions, 5 deletions

diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index 465730eaab6..573ff7acfcb 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -7043,13 +7043,9 @@ void Spell::EffectWMODamage(uint32 /*i*/)
         if(!caster)
             return;
 
-        const GameObjectInfo *gInfo = objmgr.GetGameObjectInfo(gameObjTarget->GetEntry());
-        if (!gInfo)
-            return;
-       
         FactionTemplateEntry const *casterft, *goft;
         casterft = caster->getFactionTemplateEntry();
-        goft = sFactionTemplateStore.LookupEntry(gInfo->faction);
+        goft = sFactionTemplateStore.LookupEntry(gameObjTarget->GetUInt32Value(GAMEOBJECT_FACTION));
         // Do not allow to damage GO's of friendly factions (ie: Wintergrasp Walls)
         if (casterft && goft && !casterft->IsFriendlyTo(*goft))
             gameObjTarget->TakenDamage((uint32)damage);