clean up

AlmasB · Feb 21, 2024 · 2105ceb · 2105ceb
1 parent 641b614
commit 2105ceb
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 33 deletions.
diff --git a/fxgl-core/src/main/java/com/almasb/fxgl/core/collection/grid/Grid.java b/fxgl-core/src/main/java/com/almasb/fxgl/core/collection/grid/Grid.java
@@ -147,7 +147,7 @@ public final List<T> getNeighbors(int x, int y, NeighborFilteringOption neighbor
         getDown(x, y).ifPresent(result::add);
 
         // Include "Corner" neighbors when eight directions
-        if(neighborFilteringOption.is(EIGHT_DIRECTIONS)) {
+        if (neighborFilteringOption == EIGHT_DIRECTIONS) {
             getUpLeft(x, y).ifPresent(result::add);
             getUpRight(x, y).ifPresent(result::add);
             getDownLeft(x, y).ifPresent(result::add);

diff --git a/fxgl-core/src/main/java/com/almasb/fxgl/core/collection/grid/NeighborFilteringOption.java b/fxgl-core/src/main/java/com/almasb/fxgl/core/collection/grid/NeighborFilteringOption.java
@@ -15,14 +15,4 @@
 public enum NeighborFilteringOption {
 
     FOUR_DIRECTIONS, EIGHT_DIRECTIONS;
-
-    public boolean is(NeighborFilteringOption... neighborFilteringOptions) {
-        for(NeighborFilteringOption neighborFilteringOption : neighborFilteringOptions) {
-            if(neighborFilteringOption.equals(this)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
 }
diff --git a/...-core/src/test/java/com/almasb/fxgl/core/collection/grid/NeighborFilteringOptionTest.java b/...-core/src/test/java/com/almasb/fxgl/core/collection/grid/NeighborFilteringOptionTest.java
diff --git a/fxgl-entity/src/main/java/com/almasb/fxgl/pathfinding/astar/AStarPathfinder.java b/fxgl-entity/src/main/java/com/almasb/fxgl/pathfinding/astar/AStarPathfinder.java
@@ -114,7 +114,7 @@ public List<AStarCell> findPath(AStarCell[][] grid, AStarCell start, AStarCell t
             }
         }
 
-        Heuristic<AStarCell> heuristic = (neighborFilteringOption.is(FOUR_DIRECTIONS)) ? defaultHeuristic : diagonalHeuristic;
+        Heuristic<AStarCell> heuristic = (neighborFilteringOption == FOUR_DIRECTIONS) ? defaultHeuristic : diagonalHeuristic;
 
         // reset grid cells data
         for (int y = 0; y < grid[0].length; y++) {