Don't crash server when tile with invalid tile is present on the map

kaczy93 · Jan 24, 2025 · a6a042e · a6a042e
1 parent 9d20702
commit a6a042e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 1 deletion.
diff --git a/Client/Map/ClientLandscape.cs b/Client/Map/ClientLandscape.cs
@@ -96,4 +96,9 @@ protected override Block LoadBlock(ushort x, ushort y)
 
         return block;
     }
+
+    public override void LogError(string message)
+    {
+        //TODO: Log error
+    }
 }
diff --git a/Server/Map/ServerLandscape.cs b/Server/Map/ServerLandscape.cs
@@ -572,4 +572,9 @@ public void Dispose()
         Dispose(true);
         GC.SuppressFinalize(this);
     }
+
+    public override void LogError(string message)
+    {
+        _logger.LogError(message);
+    }
 }
diff --git a/Shared/BaseLandscape.cs b/Shared/BaseLandscape.cs
@@ -283,4 +283,6 @@ public void OnStaticTileHued(StaticTile staticTile, ushort newHue)
     }
 
     protected abstract Block LoadBlock(ushort x, ushort y);
+
+    public abstract void LogError(string message);
 }
diff --git a/Shared/StaticBlock.cs b/Shared/StaticBlock.cs
@@ -101,7 +101,12 @@ public void SortTiles(ref StaticTiles[] tiledata)
                 continue;
             foreach (var tile in staticTiles)
             {
-                tile.UpdatePriority(tiledata[tile.Id]);
+                if(tiledata.Length < tile.Id)
+                    tile.UpdatePriority(tiledata[tile.Id]);
+                else
+                {
+                    Landscape.LogError($"StaticTile with invalid Id: {tile.Id}@{tile.X},{tile.Y},{tile.Z}");
+                }
             }
             staticTiles.Sort((tile1, tile2) => tile1.PriorityZ.CompareTo(tile2.PriorityZ));
             var i = staticTiles.Count;
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         protected abstract Block LoadBlock(ushort x, ushort y);
+        public abstract void LogError(string message);
     }