Fixed Another Merge Issues (resources getters)

marcomarrelli · Feb 18, 2024 · 2164a1d · 2164a1d
1 parent 5ce682e
commit 2164a1d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/pvz-clone.jar b/pvz-clone.jar
diff --git a/src/main/java/pvzclone/view/impl/GamePanel.java b/src/main/java/pvzclone/view/impl/GamePanel.java
@@ -261,14 +261,15 @@ private void updateEntities(final Graphics2D g) {
      * @return image of the entity.
      */
     private ImageIcon getEntityImage(final Entities entity) {
-        return new ImageIcon(
-                switch (entity.getEntityName()) {
-                    case "Plant" -> PLANT_IMAGE;
-                    case "Zombie" -> ZOMBIE_IMAGE;
-                    case "Bullet" -> BULLET_IMAGE;
-                    case "Sun" -> SUN_IMAGE;
-                    default -> throw new IllegalArgumentException("Unexpected value: " + entity.getClass().getName());
-                });
+        final String resource = switch (entity.getEntityName()) {
+            case "Plant" -> PLANT_IMAGE;
+            case "Zombie" -> ZOMBIE_IMAGE;
+            case "Bullet" -> BULLET_IMAGE;
+            case "Sun" -> SUN_IMAGE;
+            default -> throw new IllegalArgumentException("Unexpected value: " + entity.getClass().getName());
+        };
+
+        return new ImageIcon(ClassLoader.getSystemResource(resource));
     }
 
     /**