Core/Phases: Added missing sql and changed how phase_definitions will work, implementation still missing

2 files changed, 8 insertions, 14 deletions

diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index ea2945d9cce..c095403f261 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -9165,8 +9165,8 @@ void ObjectMgr::LoadPhaseDefinitions()
 
     uint32 oldMSTime = getMSTime();
 
-    //                                                 0       1       2         3            4           5
-    QueryResult result = WorldDatabase.Query("SELECT zoneId, entry, phasemask, phaseId, terrainswapmap, flags FROM `phase_definitions` ORDER BY `entry` ASC");
+    //                                                 0       1       2        3
+    QueryResult result = WorldDatabase.Query("SELECT zoneId, entry, phaseId, phaseGroup FROM `phase_definitions` ORDER BY `entry` ASC");
 
     if (!result)
     {
@@ -9184,18 +9184,14 @@ void ObjectMgr::LoadPhaseDefinitions()
 
         PhaseDefinition.zoneId                = fields[0].GetUInt32();
         PhaseDefinition.entry                 = fields[1].GetUInt32();
-        PhaseDefinition.phasemask             = fields[2].GetUInt32();
-        PhaseDefinition.phaseId               = fields[3].GetUInt32();
-        PhaseDefinition.terrainswapmap        = fields[4].GetUInt32();
-        PhaseDefinition.flags                 = fields[5].GetUInt32();
+        PhaseDefinition.phaseId               = fields[2].GetUInt32();
+        PhaseDefinition.phaseGroup = fields[3].GetUInt32();
 
-        // Checks
-        if ((PhaseDefinition.flags & PHASE_FLAG_OVERWRITE_EXISTING) && (PhaseDefinition.flags & PHASE_FLAG_NEGATE_PHASE))
+        if (PhaseDefinition.phaseGroup && PhaseDefinition.phaseId)
         {
-            TC_LOG_ERROR("sql.sql", "Flags defined in phase_definitions in zoneId %d and entry %u does contain PHASE_FLAG_OVERWRITE_EXISTING and PHASE_FLAG_NEGATE_PHASE. Setting flags to PHASE_FLAG_OVERWRITE_EXISTING", PhaseDefinition.zoneId, PhaseDefinition.entry);
-            PhaseDefinition.flags &= ~PHASE_FLAG_NEGATE_PHASE;
+            TC_LOG_ERROR("sql.sql", "Phase definition for zone %u (Entry: %u) has phaseGroup and phaseId set, phaseGroup set to 0", PhaseDefinition.zoneId, PhaseDefinition.entry);
+            PhaseDefinition.phaseGroup = 0;
         }
-
         _PhaseDefinitionStore[PhaseDefinition.zoneId].push_back(PhaseDefinition);
 
         ++count;
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h
index 467a56780fb..9329f441156 100644
--- a/src/server/game/Globals/ObjectMgr.h
+++ b/src/server/game/Globals/ObjectMgr.h
@@ -151,10 +151,8 @@ struct PhaseDefinition
 {
     uint32 zoneId;
     uint32 entry;
-    uint32 phasemask;
     uint32 phaseId;
-    uint32 terrainswapmap;
-    uint8 flags;
+    uint32 phaseGroup;
 };
 
 typedef std::list<PhaseDefinition> PhaseDefinitionContainer;