Don't allow marking fields after win

lscgh · Feb 7, 2024 · 14fb193 · 14fb193
1 parent 305a2f0
commit 14fb193
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/mavenmcserver/src/main/java/mavenmcserver/game/Game.java b/mavenmcserver/src/main/java/mavenmcserver/game/Game.java
@@ -321,6 +321,8 @@ public void checkForWin() {
 
 			if(this.state.getWinnerIfAny(this.config.winRequiredAmount, this.lastPlacePosition) != FieldState.NEUTRAL) {
 
+				this.listener.allowMarkingFields = false;
+
 				new BukkitRunnable() {
 
 					int i = -1;

diff --git a/mavenmcserver/src/main/java/mavenmcserver/game/GameListener.java b/mavenmcserver/src/main/java/mavenmcserver/game/GameListener.java
@@ -21,6 +21,12 @@ public class GameListener implements Listener {
 
 	Game game;
 
+	/**
+	 * If set to *false*, the game's players cannot mark any fields anymore.
+	 * True to *false* when the game ends.
+	 */
+	public boolean allowMarkingFields = true;
+
 	public GameListener(Game game) {
 		this.game = game;
 	}
@@ -113,6 +119,11 @@ public void onPlayerInteract(PlayerInteractEvent event) {
 
 		if(event.getAction() == Action.RIGHT_CLICK_BLOCK && this.game.getPlayerInTurn() == event.getPlayer()) {
 
+			if(!this.allowMarkingFields) {
+				event.setCancelled(true);
+				return;
+			}
+
 			if(this.game.gameArea.contains(event.getClickedBlock().getLocation())) {
 
 				try {

diff --git a/mavenmcserver/src/main/resources/classes.uml b/mavenmcserver/src/main/resources/classes.uml
@@ -121,6 +121,7 @@ class GameState {
 +class GameListener {
     .. Fields ..
     Game game
+    +boolean allowMarkingFields
 
     .. Methods ..
     +GameListener(Game game)

diff --git a/mavenmcserver/src/test/java/mavenmcserver/game/GameStateTest.java b/mavenmcserver/src/test/java/mavenmcserver/game/GameStateTest.java
@@ -5,7 +5,6 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.util.Arrays;
 import java.util.Map;
 import static java.util.Map.entry;