diff --git a/src/main/java/controller/Controller.java b/src/main/java/controller/Controller.java index 5996272aa9a88ea56727eeab08a687b78087c948..577ca8297d2ffe2d263bb10fdcf88a74a17bcd09 100644 --- a/src/main/java/controller/Controller.java +++ b/src/main/java/controller/Controller.java @@ -5,10 +5,7 @@ import static java.util.Objects.*; import java.util.ArrayList; import java.util.List; -import static java.util.Objects.*; -import java.util.ArrayList; -import java.util.List; import javafx.animation.Animation; import javafx.animation.KeyFrame; diff --git a/src/main/java/model/Board.java b/src/main/java/model/Board.java index 6bd1867cfe8f8835727bd0655900e9ccf5a8711c..b0e448c8012bfe706f1a8d8dcf8b642a1aec6955 100644 --- a/src/main/java/model/Board.java +++ b/src/main/java/model/Board.java @@ -4,8 +4,6 @@ import java.util.List; import util.Position; -import util.Position; - /** * This interface represents a generic board for modeling various state-based * systems. diff --git a/src/main/java/model/Entity.java b/src/main/java/model/Entity.java index 888ea61bd9f2c4a68b0bbfd86d9e6448701046f4..3270ae89da793de0e332c5802f70d4f60b88c933 100644 --- a/src/main/java/model/Entity.java +++ b/src/main/java/model/Entity.java @@ -5,10 +5,6 @@ import java.util.List; import javafx.scene.paint.Color; import util.Position; -import java.util.List; - -import javafx.scene.paint.Color; -import util.Position; public interface Entity { /** diff --git a/src/main/java/model/Mountain.java b/src/main/java/model/Mountain.java index e9587e2445d4ecf1dc43860ef665d6d30e7ce6f6..4962526a16a524ccd8b34c9b934e3263a69362a0 100644 --- a/src/main/java/model/Mountain.java +++ b/src/main/java/model/Mountain.java @@ -33,7 +33,7 @@ public class Mountain implements Entity{ @Override public void setPosition(Position p) { - this.position = position; + this.position = p; } diff --git a/src/main/java/model/Square.java b/src/main/java/model/Square.java index cdd616d8778e532772c5821122a4d975dc1ef4d5..779884b2442587710d96ef24ee0c867502f0f369 100644 --- a/src/main/java/model/Square.java +++ b/src/main/java/model/Square.java @@ -77,6 +77,9 @@ public class Square { for (Entity e : entities) { Color color = e.getViewColor(); if (color != null) { + if(sumRed == 255 & sumGreen == 255 & sumBlue == 255){ + continue; + } sumRed += color.getRed(); sumGreen += color.getGreen(); sumBlue += color.getBlue();