Merge pull request #18 from Vittorioux/main

Fix for enemy groups out of bound.
pk-hack · Aug 11, 2024 · 81b8a04 · 81b8a04
2 parents 26e7793 + 3c086c4
commit 81b8a04
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/main/java/ebhack/MapData.java b/src/main/java/ebhack/MapData.java
@@ -127,7 +127,7 @@ public NPC getNPC(int n) {
     }
 
     public EnemyGroup getEnemyGroup(int n) {
-        return enemyGroups.get(n);
+        return n < enemyGroups.size() ? enemyGroups.get(n) : null;
     }
 
     public MapEnemyGroup getMapEnemyGroup(int n) {

diff --git a/src/main/java/ebhack/MapDisplay.java b/src/main/java/ebhack/MapDisplay.java
@@ -530,6 +530,8 @@ public void drawEnemyPlate(Graphics2D g, Rectangle2D rect, int mapEnemyGroupId)
      */
     public int drawEnemyGroup(Graphics2D g, Rectangle2D bounds, Point origin, int probability, int enemyGroupId) {
         EnemyGroup enemyGroup = map.getEnemyGroup(enemyGroupId);
+        if (enemyGroup == null)
+	        return 0;
         int maxX = origin.x;
         AffineTransform stashed = g.getTransform();
         g.translate(bounds.getX(), bounds.getY());