From 6df297fc82c7434c668b5c59420041a5e5a928e9 Mon Sep 17 00:00:00 2001 From: Valentin THEDON Date: Mon, 21 Nov 2022 15:51:09 -0500 Subject: [PATCH] patch petit bug de modification concurente --- src/pigeons/Bird.java | 5 ++++- src/pigeons/Park.java | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/pigeons/Bird.java b/src/pigeons/Bird.java index a3bbde5..714b114 100644 --- a/src/pigeons/Bird.java +++ b/src/pigeons/Bird.java @@ -71,11 +71,14 @@ public class Bird implements Runnable { public Food findNearestFood() { Food nearestFood = null; int minDistance = Integer.MAX_VALUE; - for (Food f : park.getFoods()) { + int i = 0; + while(i < park.getFoods().size()){ + Food f = park.getFoods().get(i); if (this.position.distance(f.getPosition()) < minDistance && f.isFresh()) { nearestFood = f; minDistance = this.position.distance(f.getPosition()); } + i++; } return nearestFood; } diff --git a/src/pigeons/Park.java b/src/pigeons/Park.java index f9c444b..cd6c044 100644 --- a/src/pigeons/Park.java +++ b/src/pigeons/Park.java @@ -243,4 +243,8 @@ public class Park extends JPanel implements MouseListener { } } + + public boolean isBusy(){ + return (numWriter.get() > 0); + } }