From 1d469a3d80cc56fb48a93256041261eb74c2a6ea Mon Sep 17 00:00:00 2001
From: Ovahlord <dreadkiller@gmx.de>
Date: Sat, 26 Jan 2019 16:23:43 +0100
Subject: [PATCH] Core/Objects: Update position data of gameobjects and
 creatures before setting their zone scripts. This fixes capture points not
 being assigned to their outdoor pvp zone

---
 src/server/game/Entities/Creature/Creature.cpp     | 2 ++
 src/server/game/Entities/GameObject/GameObject.cpp | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index bda43da8754..073e064b3f8 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -1000,6 +1000,8 @@ bool Creature::Create(ObjectGuid::LowType guidlow, Map* map, uint32 /*phaseMask*
         return false;
     }
 
+    UpdatePositionData();
+
     if (!CreateFromProto(guidlow, entry, data, vehId))
         return false;
 
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index de42aaf55d7..b6d57f97f88 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -212,6 +212,8 @@ bool GameObject::Create(ObjectGuid::LowType guidlow, uint32 name_id, Map* map, u
     if (!dynamic)
         SetRespawnCompatibilityMode();
 
+    UpdatePositionData();
+
     SetZoneScript();
     if (m_zoneScript)
     {