Merge branch 'wintergrasp_cleanup' of https://github.com/TrinityCore/TrinityCore into wintergrasp_cleanup

This commit is contained in:
Subv
2012-03-04 12:38:32 -05:00
+2 -2
View File
@@ -953,8 +953,8 @@ bool BfCapturePoint::SetCapturePointData(GameObject* capturePoint)
m_capturePoint = capturePoint;
// check info existence
GameObjectTemplate const* goinfo = sObjectMgr->GetGameObjectTemplate(capturePoint->GetEntry());
if (!goinfo || goinfo->type != GAMEOBJECT_TYPE_CAPTURE_POINT)
GameObjectTemplate const* goinfo = capturePoint->GetGOInfo();
if (goinfo->type != GAMEOBJECT_TYPE_CAPTURE_POINT)
{
sLog->outError("OutdoorPvP: GO %u is not capture point!", capturePoint->GetEntry());
return false;