Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/WorldStates: Allow using -1 in database for MapIDs column to mark worldstates that should be bound to a map and allowed on all maps

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/071be5a0861924521da5df1ce6fc35ee5a7089d4)
This commit is contained in:
hondacrx
2022-07-25 22:01:03 -04:00
parent cea897a772
commit 3a746f931f
1 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/World/WorldStateManager.cs
+29 -11
View File
@@ -29,9 +29,11 @@ namespace Game
{ {
public class WorldStateManager : Singleton<WorldStateManager> public class WorldStateManager : Singleton<WorldStateManager>
{ {
static int AnyMap = -1;
Dictionary<int, WorldStateTemplate> _worldStateTemplates = new(); Dictionary<int, WorldStateTemplate> _worldStateTemplates = new();
Dictionary<int, int> _realmWorldStateValues = new(); Dictionary<int, int> _realmWorldStateValues = new();
Dictionary<uint, Dictionary<int, int>> _worldStatesByMap = new(); Dictionary<int, Dictionary<int, int>> _worldStatesByMap = new();
WorldStateManager() { } WorldStateManager() { }
@@ -56,13 +58,13 @@ namespace Game
{ {
foreach (string mapIdToken in new StringArray(mapIds, ',')) foreach (string mapIdToken in new StringArray(mapIds, ','))
{ {
if (!uint.TryParse(mapIdToken, out uint mapId)) if (!int.TryParse(mapIdToken, out int mapId))
{ {
Log.outError(LogFilter.Sql, $"Table `world_state` contains a world state {id} with non-integer MapID ({mapIdToken}), map ignored"); Log.outError(LogFilter.Sql, $"Table `world_state` contains a world state {id} with non-integer MapID ({mapIdToken}), map ignored");
continue; continue;
} }
if (!CliDB.MapStorage.ContainsKey(mapId)) if (!CliDB.MapStorage.ContainsKey(mapId) && mapId != AnyMap)
{ {
Log.outError(LogFilter.Sql, $"Table `world_state` contains a world state {id} with invalid MapID ({mapId}), map ignored"); Log.outError(LogFilter.Sql, $"Table `world_state` contains a world state {id} with invalid MapID ({mapId}), map ignored");
continue; continue;
@@ -120,7 +122,7 @@ namespace Game
if (!worldState.MapIds.Empty()) if (!worldState.MapIds.Empty())
{ {
foreach (uint mapId in worldState.MapIds) foreach (int mapId in worldState.MapIds)
{ {
if (!_worldStatesByMap.ContainsKey(mapId)) if (!_worldStatesByMap.ContainsKey(mapId))
_worldStatesByMap[mapId] = new(); _worldStatesByMap[mapId] = new();
@@ -157,8 +159,13 @@ namespace Game
if (!worldState.MapIds.Empty()) if (!worldState.MapIds.Empty())
{ {
foreach (uint mapId in worldState.MapIds) foreach (int mapId in worldState.MapIds)
{
if (!_worldStatesByMap.ContainsKey(mapId))
_worldStatesByMap[mapId] = new();
_worldStatesByMap[mapId][worldStateId] = value; _worldStatesByMap[mapId][worldStateId] = value;
}
} }
else else
_realmWorldStateValues[worldStateId] = value; _realmWorldStateValues[worldStateId] = value;
@@ -187,7 +194,7 @@ namespace Game
if (worldStateTemplate == null || worldStateTemplate.MapIds.Empty()) if (worldStateTemplate == null || worldStateTemplate.MapIds.Empty())
return _realmWorldStateValues.LookupByKey(worldStateId); return _realmWorldStateValues.LookupByKey(worldStateId);
if (map == null || !worldStateTemplate.MapIds.Contains(map.GetId())) if (map == null || (!worldStateTemplate.MapIds.Contains((int)map.GetId()) && !worldStateTemplate.MapIds.Contains(AnyMap)))
return 0; return 0;
return map.GetWorldStateValue(worldStateId); return map.GetWorldStateValue(worldStateId);
@@ -230,7 +237,7 @@ namespace Game
return; return;
} }
if (map == null || !worldStateTemplate.MapIds.Contains(map.GetId())) if (map == null || (!worldStateTemplate.MapIds.Contains((int)map.GetId()) && !worldStateTemplate.MapIds.Contains(AnyMap)))
return; return;
map.SetWorldStateValue(worldStateId, value, hidden); map.SetWorldStateValue(worldStateId, value, hidden);
@@ -260,10 +267,21 @@ namespace Game
public Dictionary<int, int> GetInitialWorldStatesForMap(Map map) public Dictionary<int, int> GetInitialWorldStatesForMap(Map map)
{ {
if (_worldStatesByMap.TryGetValue(map.GetId(), out Dictionary<int, int> initialValues)) Dictionary<int, int> initialValues = new();
return initialValues;
return new Dictionary<int, int>(); if (_worldStatesByMap.TryGetValue((int)map.GetId(), out Dictionary<int, int> valuesTemplate))
{
foreach (var (key, value) in valuesTemplate)
initialValues.Add(key, value);
}
if (_worldStatesByMap.TryGetValue(AnyMap, out valuesTemplate))
{
foreach (var (key, value) in valuesTemplate)
initialValues.Add(key, value);
}
return initialValues;
} }
public void FillInitialWorldStates(InitWorldStates initWorldStates, Map map, uint playerAreaId) public void FillInitialWorldStates(InitWorldStates initWorldStates, Map map, uint playerAreaId)
@@ -292,7 +310,7 @@ namespace Game
public int DefaultValue; public int DefaultValue;
public uint ScriptId; public uint ScriptId;
public List<uint> MapIds = new(); public List<int> MapIds = new();
public List<uint> AreaIds = new(); public List<uint> AreaIds = new();
} }
} }