Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

src/server/game/Entities/GameObject/GameObject.cpp

@@ -901,11 +901,6 @@ void GameObject::DeleteFromDB()
     WorldDatabase.Execute(stmt);
 }
 
-GameObject* GameObject::GetGameObject(WorldObject& object, uint64 guid)
-{
-    return object.GetMap()->GetGameObject(guid);
-}
-
 /*********************************************************/
 /***                    QUEST SYSTEM                   ***/
 /*********************************************************/