MineNet/Minigames
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

fixed score

Browse Source
This commit is contained in:
Lars Neuhaus
2024-11-23 23:56:18 +01:00
parent 3fe57d5fe9
commit 18689ac0df
6 changed files with 35 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/tetris/Tetris.java
View File

@@ -16,9 +16,7 @@ import net.minestom.server.item.ItemStack;
import net.minestom.server.item.Material;
import org.jetbrains.annotations.NotNull;
import java.util.Map;
import java.util.Random;
import java.util.WeakHashMap;
import java.util.*;
class Tetris extends StatelessGame {
private final Map<Player, TetrisGame> tetrisGames = new WeakHashMap<>();
@@ -42,6 +40,8 @@ class Tetris extends StatelessGame {
Random random = new Random();
this.randomSeed = random.nextLong();
System.out.println("1");
}
@Override
@@ -68,21 +68,23 @@ class Tetris extends StatelessGame {
@Override
protected void onPlayerLeave(Player p) {
System.out.println("2");
this.tetrisGames.get(p).sidebar.removeViewer(p);
this.letPlayerLoose(p);
}
@Override
protected void onPlayerMove(@NotNull PlayerMoveEvent event) {
event.setCancelled(true);
Player player = event.getPlayer();
Pos previousPosition = event.getPlayer().getPosition();
Pos currentPosition = event.getNewPosition();
TetrisGame tetrisGame = this.tetrisGames.get(player);
if(tetrisGame == null) return;
if(tetrisGame == null) {
event.setCancelled(true);
return;
}
if(tetrisGame.lost) return;
if(player.getGameMode() == GameMode.SPECTATOR) return;
@@ -132,11 +134,13 @@ class Tetris extends StatelessGame {
TetrisGame tetrisGame = this.tetrisGames.get(player);
if(tetrisGame == null) return;
if(tetrisGame.lost && player.getGameMode() != GameMode.SPECTATOR) {
System.out.println("3");
letPlayerLoose(player);
}
}
private void letPlayerLoose(Player player) {
System.out.println("4");
TetrisGame tetrisGame = this.tetrisGames.get(player);
player.setGameMode(GameMode.SPECTATOR);
player.setInvisible(true);
@@ -167,8 +171,10 @@ class Tetris extends StatelessGame {
this.hasCombat,
this.randomSeed
);
this.tetrisGames.get(p).generate();
this.tetrisGames.values().forEach(tetrisGame -> tetrisGame.updateOtherTetrisGames(this.tetrisGames.values()));
newTetrisGame.generate();
List<TetrisGame> games = new ArrayList<>(this.tetrisGames.values());
games.add(newTetrisGame);
this.tetrisGames.values().forEach(tetrisGame -> tetrisGame.updateOtherTetrisGames(games));
return newTetrisGame;
});