From 809fc5614349ff52661e2f7dc915069211525fdc Mon Sep 17 00:00:00 2001
From: Yanis OUALAN <oualanyanis01@gmail.com>
Date: Fri, 22 Nov 2024 10:35:53 +0100
Subject: [PATCH] =?UTF-8?q?Suppression=20des=20imports=20inutilis=C3=A9,?=
=?UTF-8?q?=20et=20correction=20de=20setPosition=20dans=20Mountain?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/controller/Controller.java | 3 ---
src/main/java/model/Board.java | 2 --
src/main/java/model/Entity.java | 4 ----
src/main/java/model/Mountain.java | 2 +-
src/main/java/model/Square.java | 3 +++
5 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/src/main/java/controller/Controller.java b/src/main/java/controller/Controller.java
index 5996272..577ca82 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 6bd1867..b0e448c 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 888ea61..3270ae8 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 e9587e2..4962526 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 cdd616d..779884b 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();
--
GitLab