edgegamers · MSWS · Aug 13, 2024 · Aug 8, 2024 · Aug 8, 2024 · Aug 10, 2024
diff --git a/lang/Jailbreak.English/SpecialDay/GunDayLocale.cs b/lang/Jailbreak.English/SpecialDay/GunDayLocale.cs
@@ -1,7 +1,6 @@
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
 using Jailbreak.Formatting.Base;
-using Jailbreak.Formatting.Views;
 using Jailbreak.Formatting.Views.SpecialDay;
 
 namespace Jailbreak.English.SpecialDay;

diff --git a/lang/Jailbreak.English/SpecialDay/SDLocale.cs b/lang/Jailbreak.English/SpecialDay/SDLocale.cs
@@ -3,7 +3,6 @@
 using Jailbreak.Formatting.Core;
 using Jailbreak.Formatting.Logistics;
 using Jailbreak.Formatting.Objects;
-using Jailbreak.Formatting.Views;
 using Jailbreak.Formatting.Views.SpecialDay;
 
 namespace Jailbreak.English.SpecialDay;

diff --git a/lang/Jailbreak.English/SpecialDay/SoloDayLocale.cs b/lang/Jailbreak.English/SpecialDay/SoloDayLocale.cs
@@ -1,5 +1,4 @@
 using Jailbreak.Formatting.Base;
-using Jailbreak.Formatting.Views;
 using Jailbreak.Formatting.Views.SpecialDay;
 using Jailbreak.Public.Utils;
 

diff --git a/lang/Jailbreak.English/SpecialDay/SpeedrunDayLocale.cs b/lang/Jailbreak.English/SpecialDay/SpeedrunDayLocale.cs
@@ -1,7 +1,6 @@
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
 using Jailbreak.Formatting.Base;
-using Jailbreak.Formatting.Views;
 using Jailbreak.Formatting.Views.SpecialDay;
 
 namespace Jailbreak.English.SpecialDay;

diff --git a/lang/Jailbreak.English/SpecialDay/TeamDayLocale.cs b/lang/Jailbreak.English/SpecialDay/TeamDayLocale.cs
@@ -1,6 +1,5 @@
 using CounterStrikeSharp.API.Modules.Utils;
 using Jailbreak.Formatting.Base;
-using Jailbreak.Formatting.Views;
 using Jailbreak.Formatting.Views.SpecialDay;
 using Jailbreak.Public.Utils;
 

diff --git a/mod/Jailbreak.Debug/Subcommands/DebugZone.cs b/mod/Jailbreak.Debug/Subcommands/DebugZone.cs
@@ -48,6 +48,7 @@ public override void OnCommand(CCSPlayerController? executor,
       specifiedType = success;
     }
 
+    string map = Server.MapName;
     switch (info.GetArg(1).ToLower()) {
       case "finish":
       case "done":
@@ -76,8 +77,9 @@ public override void OnCommand(CCSPlayerController? executor,
         var zoneCount = 0;
         foreach (var type in Enum.GetValues<ZoneType>()) {
           if (specifiedType != null && type != specifiedType) continue;
-          var displayZones =
-            zoneManager.GetZones(type).GetAwaiter().GetResult();
+          var displayZones = zoneManager.GetZones(map, type)
+           .GetAwaiter()
+           .GetResult();
           foreach (var z in displayZones) z.Draw(plugin, type.GetColor(), 120);
 
           zoneCount += displayZones.Count;
@@ -101,7 +103,7 @@ public override void OnCommand(CCSPlayerController? executor,
         var toDelete = getUniqueZone(executor, specifiedType);
         if (toDelete == null) return;
         Server.NextFrameAsync(async () => {
-          await zoneManager.DeleteZone(toDelete.Value.Item1.Id);
+          await zoneManager.DeleteZone(toDelete.Value.Item1.Id, map);
           Server.NextFrame(() => {
             executor.PrintToChat("Deleted zone #" + toDelete.Value.Item1.Id);
           });
@@ -113,9 +115,8 @@ public override void OnCommand(CCSPlayerController? executor,
         if (innerPair == null) return;
         var innerZone = innerPair.Value.Item1;
         innerZone.AddPoint(position);
-        var map = Server.MapName;
         Server.NextFrameAsync(async () => {
-          await zoneManager.DeleteZone(innerZone.Id);
+          await zoneManager.DeleteZone(innerZone.Id, map);
           await zoneManager.PushZoneWithID(innerZone, innerPair.Value.Item2,
             map);
           Server.NextFrame(() => {
@@ -145,7 +146,9 @@ await zoneManager.PushZoneWithID(innerZone, innerPair.Value.Item2,
 
         if (specifiedType == null) {
           foreach (var type in Enum.GetValues<ZoneType>()) {
-            var zones = zoneManager.GetZones(type).GetAwaiter().GetResult();
+            var zones = zoneManager.GetZones(Server.MapName, type)
+             .GetAwaiter()
+             .GetResult();
             if (!allZones.ContainsKey(type)) continue;
 
             info.ReplyToCommand($"{type} zones: {zones.Count}");
@@ -154,7 +157,7 @@ await zoneManager.PushZoneWithID(innerZone, innerPair.Value.Item2,
           return;
         }
 
-        var toList = zoneManager.GetZones(specifiedType.Value)
+        var toList = zoneManager.GetZones(map, specifiedType.Value)
          .GetAwaiter()
          .GetResult();
         foreach (var listZone in toList)
@@ -164,7 +167,7 @@ await zoneManager.PushZoneWithID(innerZone, innerPair.Value.Item2,
       case "cleanup":
         // Cleanup auto-generated zones
         // Remove spawns that are inside of any DO NOT TELEPORT zones
-        var spawns = zoneManager.GetZones(ZoneType.SPAWN_AUTO)
+        var spawns = zoneManager.GetZones(map, ZoneType.SPAWN_AUTO)
          .GetAwaiter()
          .GetResult();
         if (spawns.Count == 0) {
@@ -173,7 +176,8 @@ await zoneManager.PushZoneWithID(innerZone, innerPair.Value.Item2,
         }
 
         var doNotTeleport = zoneManager
-         .GetZones(ZoneTypeExtensions.DoNotTeleports().ToArray())
+         .GetZones(Server.MapName,
+            ZoneTypeExtensions.DoNotTeleports().ToArray())
          .GetAwaiter()
          .GetResult();
 
@@ -186,7 +190,8 @@ await zoneManager.PushZoneWithID(innerZone, innerPair.Value.Item2,
         info.ReplyToCommand("Removing " + toRemove.Count
           + " auto-generated zones");
         Server.NextFrameAsync(async () => {
-          foreach (var z in toRemove) await zoneManager.DeleteZone(z.Id);
+          foreach (var z in toRemove)
+            await zoneManager.DeleteZone(z.Id, map);
         });
         return;
     }
@@ -203,14 +208,15 @@ await zoneManager.PushZoneWithID(innerZone, innerPair.Value.Item2,
         attemptBeginCreation(executor, specifiedType.Value);
         return;
       case "set":
-        var zones = zoneManager.GetZones(specifiedType.Value)
+        var zones = zoneManager.GetZones(Server.MapName, specifiedType.Value)
          .GetAwaiter()
          .GetResult();
 
         Server.NextFrameAsync(async () => {
           var copy = zones.ToList();
 
-          foreach (var zone in copy) await zoneManager.DeleteZone(zone.Id);
+          foreach (var zone in copy)
+            await zoneManager.DeleteZone(zone.Id, Server.MapName);
 
           Server.NextFrame(()
             => attemptBeginCreation(executor, specifiedType.Value));

diff --git a/mod/Jailbreak.SpecialDay/SpecialDays/AbstractArmoryRestrictedDay.cs b/mod/Jailbreak.SpecialDay/SpecialDays/AbstractArmoryRestrictedDay.cs
@@ -31,7 +31,7 @@ public virtual IView ArmoryReminder
 
   override protected IZone GetZone() {
     var manager = provider.GetRequiredService<IZoneManager>();
-    var zones   = manager.GetZones(ZoneType.ARMORY).GetAwaiter().GetResult();
+    var zones   = manager.GetZones(Server.MapName, ZoneType.ARMORY).GetAwaiter().GetResult();
     if (zones.Count > 0) return new MultiZoneWrapper(zones);
 
     var bounds = new DistanceZone(

diff --git a/mod/Jailbreak.SpecialDay/SpecialDays/AbstractCellRestrictedDay.cs b/mod/Jailbreak.SpecialDay/SpecialDays/AbstractCellRestrictedDay.cs
@@ -30,7 +30,7 @@ public virtual IView CellReminder
 
   override protected IZone GetZone() {
     var manager = provider.GetRequiredService<IZoneManager>();
-    var zones   = manager.GetZones(ZoneType.CELL).GetAwaiter().GetResult();
+    var zones   = manager.GetZones(Server.MapName, ZoneType.CELL).GetAwaiter().GetResult();
     if (zones.Count > 0) return new MultiZoneWrapper(zones);
 
     var bounds = new DistanceZone(

diff --git a/mod/Jailbreak.Zones/RandomZoneGenerator.cs b/mod/Jailbreak.Zones/RandomZoneGenerator.cs
@@ -127,19 +127,23 @@ private float zoneScore(IList<IZone>? zones) {
   }
 
   private IList<IZone> getManualSpawnPoints() {
-    var zones = zoneManager.GetZones(ZoneType.SPAWN).GetAwaiter().GetResult();
+    var zones = zoneManager.GetZones(Server.MapName, ZoneType.SPAWN)
+     .GetAwaiter()
+     .GetResult();
     return zones;
   }
 
   private IList<IZone> getAutoSpawnPoints() {
-    var zones = zoneManager.GetZones(ZoneType.SPAWN_AUTO)
+    var zones = zoneManager.GetZones(Server.MapName, ZoneType.SPAWN_AUTO)
      .GetAwaiter()
      .GetResult();
     return zones;
   }
 
   private IZone getCells() {
-    var result = zoneManager.GetZones(ZoneType.CELL).GetAwaiter().GetResult();
+    var result = zoneManager.GetZones(Server.MapName, ZoneType.CELL)
+     .GetAwaiter()
+     .GetResult();
     if (result.Count > 0) return new MultiZoneWrapper(result);
 
     var bounds = new DistanceZone(
@@ -154,11 +158,15 @@ private IZone getCells() {
   private IList<IZone> getRestrictedAreas() {
     List<IZone> result = [];
     foreach (var zone in ZoneTypeExtensions.DoNotTeleports()) {
-      var zones = zoneManager.GetZones(zone).GetAwaiter().GetResult();
+      var zones = zoneManager.GetZones(Server.MapName, zone)
+       .GetAwaiter()
+       .GetResult();
       result.AddRange(zones);
     }
 
-    var armory = zoneManager.GetZones(ZoneType.ARMORY).GetAwaiter().GetResult();
+    var armory = zoneManager.GetZones(Server.MapName, ZoneType.ARMORY)
+     .GetAwaiter()
+     .GetResult();
     if (armory.Count == 0) {
       var bounds = new DistanceZone(
         Utilities

diff --git a/mod/Jailbreak.Zones/SqlZoneManager.cs b/mod/Jailbreak.Zones/SqlZoneManager.cs
@@ -132,10 +132,10 @@ public async Task PushZone(IZone zone, ZoneType type, string map) {
     await PushZoneWithID(zone, type, map);
   }
 
-  public async Task UpdateZone(IZone zone, ZoneType type, int id) {
-    await DeleteZone(id, Server.MapName);
+  public async Task UpdateZone(IZone zone, ZoneType type, int id, string map) {
+    await DeleteZone(id, map);
     zone.Id = id;
-    await PushZoneWithID(zone, type, Server.MapName);
+    await PushZoneWithID(zone, type, map);
   }
 
   public Task<Dictionary<ZoneType, IList<IZone>>> GetAllZones() {

diff --git a/public/Jailbreak.Public/Mod/SpecialDay/AbstractSpecialDay.cs b/public/Jailbreak.Public/Mod/SpecialDay/AbstractSpecialDay.cs
@@ -210,12 +210,15 @@ protected List<Vector> getRandomSpawns(bool includeSpawns = true,
     var zoneManager = Provider.GetService<IZoneManager>();
     if (zoneManager != null) {
       if (includeAuto)
-        result.AddRange(zoneManager.GetZones(ZoneType.SPAWN_AUTO)
+        result.AddRange(zoneManager
+         .GetZones(Server.MapName, ZoneType.SPAWN_AUTO)
          .GetAwaiter()
          .GetResult()
          .Select(z => z.GetCenterPoint()));
 
-      var zones = zoneManager.GetZones(ZoneType.SPAWN).GetAwaiter().GetResult();
+      var zones = zoneManager.GetZones(Server.MapName, ZoneType.SPAWN)
+       .GetAwaiter()
+       .GetResult();
       result.AddRange(zones.Select(z => z.GetCenterPoint()));
     }
 

diff --git a/public/Jailbreak.Public/Mod/Zones/IZoneManager.cs b/public/Jailbreak.Public/Mod/Zones/IZoneManager.cs
@@ -5,19 +5,29 @@ namespace Jailbreak.Public.Mod.Zones;
 
 public interface IZoneManager : IPluginBehavior {
   Task LoadZones(string map);
-  Task DeleteZone(int zoneId) { return DeleteZone(zoneId, Server.MapName); }
+
+  [Obsolete(
+    "This method hides asynchroneous behavior, use the async version instead")]
+  Task DeleteZone(int zoneId) {
+    Server.NextFrame(() => {
+      var map = Server.MapName;
+      Server.NextFrameAsync(async () => { await DeleteZone(zoneId, map); });
+    });
+    return Task.CompletedTask;
+  }
+
   Task DeleteZone(int zoneId, string map);
 
   Task<IList<IZone>> GetZones(string map, ZoneType type);
 
-  async Task<IList<IZone>> GetZones(params ZoneType[] type) {
+  async Task<IList<IZone>> GetZones(string map, params ZoneType[] type) {
     List<Task<IList<IZone>>> tasks = [];
-    tasks.AddRange(type.Select(GetZones));
+    tasks.AddRange(type.Select(t => GetZones(t, map)));
     return (await Task.WhenAll(tasks)).SelectMany(x => x).ToList();
   }
 
-  Task<IList<IZone>> GetZones(ZoneType type) {
-    return GetZones(Server.MapName, type);
+  Task<IList<IZone>> GetZones(ZoneType type, string map) {
+    return GetZones(map, type);
   }
 
   Task PushZoneWithID(IZone zone, ZoneType type, string map);
@@ -27,7 +37,7 @@ Task PushZone(IZone zone, ZoneType type) {
     return PushZone(zone, type, Server.MapName);
   }
 
-  Task UpdateZone(IZone zone, ZoneType type, int id);
+  Task UpdateZone(IZone zone, ZoneType type, int id, string map);
 
   Task<Dictionary<ZoneType, IList<IZone>>> GetAllZones();
 }
diff --git a/public/Jailbreak.Public/Utils/MapUtil.cs b/public/Jailbreak.Public/Utils/MapUtil.cs
@@ -19,7 +19,7 @@ private static Vector getCtSpawn() {
   }
 
   public static bool OpenCells(IZoneManager zoneManager) {
-    var zones = zoneManager.GetZones(ZoneType.CELL_BUTTON)
+    var zones = zoneManager.GetZones(Server.MapName, ZoneType.CELL_BUTTON)
      .GetAwaiter()
      .GetResult();