From 8594f8029c7499c202d12298b8bc0ba9dc94239b Mon Sep 17 00:00:00 2001 From: lars Date: Tue, 22 Oct 2024 17:05:24 +0200 Subject: [PATCH] fixed score at end of tetris not working --- .../game/stateless/types/tetris/game/TetrisGame.java | 12 ++++++++---- .../mhsl/minenet/minigames/score/PointsWinScore.java | 3 +-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/tetris/game/TetrisGame.java b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/tetris/game/TetrisGame.java index c32c4d4..928469f 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/tetris/game/TetrisGame.java +++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/tetris/game/TetrisGame.java @@ -57,11 +57,11 @@ public class TetrisGame { } public void pressedButton(Button button) { - if(lastPresses.getOrDefault(button, 0L) >= System.currentTimeMillis()-100) return; + if(this.lastPresses.getOrDefault(button, 0L) >= System.currentTimeMillis()-100) return; - lastPresses.put(button, System.currentTimeMillis()); - if(button == Button.W) lastPresses.put(button, System.currentTimeMillis()+70); - if(button == Button.S) lastPresses.put(button, System.currentTimeMillis()-70); + this.lastPresses.put(button, System.currentTimeMillis()); + if(button == Button.W) this.lastPresses.put(button, System.currentTimeMillis()+70); + if(button == Button.S) this.lastPresses.put(button, System.currentTimeMillis()-70); switch (button) { case A -> this.moveLeft(); @@ -74,6 +74,10 @@ public class TetrisGame { } } + public void releaseButton(Button button) { + this.lastPresses.put(button, 0L); + } + public Pos getPlayerSpawnPosition() { return this.playfield.getPlayerSpawnPosition(); } diff --git a/src/main/java/eu/mhsl/minenet/minigames/score/PointsWinScore.java b/src/main/java/eu/mhsl/minenet/minigames/score/PointsWinScore.java index 5164e65..95ba294 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/score/PointsWinScore.java +++ b/src/main/java/eu/mhsl/minenet/minigames/score/PointsWinScore.java @@ -4,7 +4,6 @@ import eu.mhsl.minenet.minigames.message.TranslatableMessage; import eu.mhsl.minenet.minigames.message.type.TitleMessage; import eu.mhsl.minenet.minigames.util.MapUtil; import net.minestom.server.entity.Player; -import org.apache.commons.lang3.NotImplementedException; import java.time.Duration; import java.util.*; @@ -22,7 +21,7 @@ public class PointsWinScore extends Score { @Override protected void insertResultImplementation(Set p) { - throw new NotImplementedException("PointsWinScore does not support adding entries without points"); + this.insertResultImplementation(p, 0); } @Override