made map iterator stay inside map

Author: EnderCrypt

src/main/java/net/ddns/endercypt/cs2dmap/library/map/sub/extra/map/MapArray.java

@@ -153,22 +153,23 @@ public void process(int x, int y, Tile tile)
 		});
 	}
 
-	public void iterate(int x1, int y1, int x2, int y2, MapIterator mapIterator)
+	public void iterate(MapIterator mapIterator)
 	{
-		for (int x = x1; x < x2 + 1; x++)
-		{
-			for (int y = y1; y < y2 + 1; y++)
-			{
-				mapIterator.process(x, y, tile(x, y));
-			}
-		}
+		iterate(0, 0, getWidth(), getHeight(), mapIterator);
 	}
 
-	public void iterate(MapIterator mapIterator)
+	public void iterate(int x1, int y1, int x2, int y2, MapIterator mapIterator)
 	{
-		for (int x = 0; x < getWidth(); x++)
+		// limit to inside map
+		x1 = Math.max(x1, 0);
+		y1 = Math.max(y1, 0);
+		x2 = Math.min(x2, getWidth() - 1);
+		y2 = Math.min(y2, getHeight() - 1);
+
+		// iterate
+		for (int x = x1; x < x2 + 1; x++)
 		{
-			for (int y = 0; y < getHeight(); y++)
+			for (int y = y1; y < y2 + 1; y++)
 			{
 				mapIterator.process(x, y, tile(x, y));
 			}

src/main/java/test/CreateMap.java

@@ -10,11 +10,13 @@
 import net.ddns.endercypt.cs2dmap.library.map.obj.entity.type.info.Info_Hostage;
 import net.ddns.endercypt.cs2dmap.library.map.obj.entity.type.info.Info_T;
 import net.ddns.endercypt.cs2dmap.library.map.obj.entity.type.info.Info_Hostage.HostageLooks;
+import net.ddns.endercypt.cs2dmap.library.map.obj.tile.Tile;
 import net.ddns.endercypt.cs2dmap.library.map.obj.tile.modifier.ColorTileModifier;
 import net.ddns.endercypt.cs2dmap.library.map.sub.Cs2dBackground;
 import net.ddns.endercypt.cs2dmap.library.map.sub.Cs2dEntities;
 import net.ddns.endercypt.cs2dmap.library.map.sub.Cs2dMapArray;
 import net.ddns.endercypt.cs2dmap.library.map.sub.Cs2dTiles;
+import net.ddns.endercypt.cs2dmap.library.map.sub.extra.map.MapIterator;
 import net.ddns.endercypt.cs2dmap.library.map.sub.extra.map.MapSection;
 import net.ddns.endercypt.cs2dmap.library.map.sub.extra.tile.TileMode;
 import net.ddns.endercypt.cs2dmap.library.map.sub.extra.tile.action.TileActions;
@@ -48,6 +50,15 @@ public static void main(String[] args) throws IOException
 			map.tile(2, 9).setFrame(5);
 			map.tile(5, 8).setTileModifier(new ColorTileModifier(255, 0, 0, 1));
 
+			map.iterate(new MapIterator()
+			{
+				@Override
+				public void process(int x, int y, Tile tile)
+				{
+					tile.setFrame(15);
+				}
+			});
+
 			MapSection copy = map.copy(0, 0, 5, 5);
 			copy.pasteInto(map, -1, -1);