perfectet colorjump timer, cancelled inventory movement

Reviewed-on: #12
Reviewed-by: Lars Neuhaus <larslukasneuhaus@gmx.de>

build.gradle

@@ -60,9 +60,9 @@ dependencies {
     implementation 'io.github.TogAr2:MinestomPvP:PR62-SNAPSHOT'
 
     // Hephaestus engine
-    implementation("team.unnamed:hephaestus-api:0.2.1-SNAPSHOT")
-    implementation("team.unnamed:hephaestus-reader-blockbench:0.2.1-SNAPSHOT")
-    implementation("team.unnamed:hephaestus-runtime-minestom:0.2.1-SNAPSHOT")
+//    implementation("team.unnamed:hephaestus-api:0.2.1-SNAPSHOT")
+//    implementation("team.unnamed:hephaestus-reader-blockbench:0.2.1-SNAPSHOT")
+//    implementation("team.unnamed:hephaestus-runtime-minestom:0.2.1-SNAPSHOT")
 }
 
 tasks {

src/main/java/eu/mhsl/minenet/minigames/command/privileged/PublishRewardCommand.java

@@ -25,7 +25,7 @@ public class PublishRewardCommand extends PrivilegedCommand {
 
                 String rewardRequestJson = new Gson().toJson(room.getTournament().getRewards());
                 HttpRequest giveRewardsRequest = HttpRequest.newBuilder()
-                    .uri(new URI("http://10.20.7.1:8080/api/event/reward"))
+                    .uri(new URI("http://10.20.9.3:8080/api/event/reward"))
                     .POST(HttpRequest.BodyPublishers.ofString(rewardRequestJson))
                     .build();
 

src/main/java/eu/mhsl/minenet/minigames/handler/global/ChatFormatHandler.java

@@ -2,6 +2,8 @@ package eu.mhsl.minenet.minigames.handler.global;
 
 import eu.mhsl.minenet.minigames.message.Icon;
 import eu.mhsl.minenet.minigames.message.type.ChatMessage;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
 import net.minestom.server.event.EventListener;
 import net.minestom.server.event.player.PlayerChatEvent;
 import org.jetbrains.annotations.NotNull;
@@ -14,7 +16,14 @@ public class ChatFormatHandler implements EventListener<PlayerChatEvent> {
 
     @Override
     public @NotNull Result run(@NotNull PlayerChatEvent event) {
-        event.setFormattedMessage(new ChatMessage(Icon.CHAT).appendStatic(event.getRawMessage()).build(event.getPlayer()));
+        NamedTextColor color = event.getPlayer().getPermissionLevel() > 0 ? NamedTextColor.AQUA : NamedTextColor.GRAY;
+        event.setFormattedMessage(
+            new ChatMessage(Icon.CHAT)
+                .appendStatic(Component.text(event.getPlayer().getUsername(), color))
+                .appendStatic(Component.text(" > ", NamedTextColor.DARK_GRAY))
+                .appendStatic(event.getRawMessage())
+                .build(event.getPlayer())
+        );
         return Result.SUCCESS;
     }
 }

src/main/java/eu/mhsl/minenet/minigames/instance/game/GameList.java

@@ -5,14 +5,18 @@ import eu.mhsl.minenet.minigames.instance.game.stateless.types.acidRain.AcidRain
 import eu.mhsl.minenet.minigames.instance.game.stateless.types.anvilRun.AnvilRunFactory;
 import eu.mhsl.minenet.minigames.instance.game.stateless.types.backrooms.BackroomsFactory;
 import eu.mhsl.minenet.minigames.instance.game.stateless.types.bedwars.BedwarsFactory;
+import eu.mhsl.minenet.minigames.instance.game.stateless.types.blockBattle.BlockBattleFactory;
 import eu.mhsl.minenet.minigames.instance.game.stateless.types.blockBreakRace.BlockBreakRaceFactory;
+import eu.mhsl.minenet.minigames.instance.game.stateless.types.boatRace.BoatRaceFactory;
 import eu.mhsl.minenet.minigames.instance.game.stateless.types.bowSpleef.BowSpleefFactory;
+import eu.mhsl.minenet.minigames.instance.game.stateless.types.colorJump.ColorJumpFactory;
 import eu.mhsl.minenet.minigames.instance.game.stateless.types.deathcube.DeathcubeFactory;
 import eu.mhsl.minenet.minigames.instance.game.stateless.types.elytraRace.ElytraRaceFactory;
 import eu.mhsl.minenet.minigames.instance.game.stateless.types.fastbridge.FastbridgeFactory;
 import eu.mhsl.minenet.minigames.instance.game.stateless.types.highGround.HighGroundFactory;
 import eu.mhsl.minenet.minigames.instance.game.stateless.types.jumpDive.JumpDiveFactory;
 import eu.mhsl.minenet.minigames.instance.game.stateless.types.minerun.MinerunFactory;
+import eu.mhsl.minenet.minigames.instance.game.stateless.types.pillars.PillarsFactory;
 import eu.mhsl.minenet.minigames.instance.game.stateless.types.spaceSnake.SpaceSnakeFactory;
 import eu.mhsl.minenet.minigames.instance.game.stateless.types.spleef.SpleefFactory;
 import eu.mhsl.minenet.minigames.instance.game.stateless.types.stickfight.StickFightFactory;
@@ -44,7 +48,11 @@ public enum GameList {
     HIGHGROUND(new HighGroundFactory(), GameType.PVP),
     FASTBRIDGE(new FastbridgeFactory(), GameType.OTHER),
     BLOCKBREAKRACE(new BlockBreakRaceFactory(), GameType.OTHER),
-    SPACESNAKE(new SpaceSnakeFactory(), GameType.PVP);
+    SPACESNAKE(new SpaceSnakeFactory(), GameType.PVP),
+    BOATRACE(new BoatRaceFactory(), GameType.OTHER),
+    PILLARS(new PillarsFactory(), GameType.PROTOTYPE),
+    BLOCKBATTLE(new BlockBattleFactory(), GameType.PVP),
+    COLORJUMP(new ColorJumpFactory(), GameType.PROTOTYPE);
 
     private final GameFactory factory;
     private final GameType type;

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/blockBattle/BlockBattle.java

@@ -0,0 +1,207 @@
+package eu.mhsl.minenet.minigames.instance.game.stateless.types.blockBattle;
+
+import eu.mhsl.minenet.minigames.instance.Dimension;
+import eu.mhsl.minenet.minigames.instance.game.stateless.StatelessGame;
+import eu.mhsl.minenet.minigames.score.FirstWinsScore;
+import eu.mhsl.minenet.minigames.util.BatchUtil;
+import io.github.togar2.pvp.events.FinalAttackEvent;
+import io.github.togar2.pvp.feature.CombatFeatures;
+import net.minestom.server.coordinate.Pos;
+import net.minestom.server.entity.GameMode;
+import net.minestom.server.entity.Player;
+import net.minestom.server.event.player.PlayerBlockBreakEvent;
+import net.minestom.server.event.player.PlayerBlockPlaceEvent;
+import net.minestom.server.event.player.PlayerMoveEvent;
+import net.minestom.server.instance.batch.AbsoluteBlockBatch;
+import net.minestom.server.instance.block.Block;
+import net.minestom.server.item.ItemStack;
+import net.minestom.server.item.Material;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
+
+public class BlockBattle extends StatelessGame {
+    private final Team teamBlue = new Team(new Pos(0,101,20).add(0.5).withView(180, 0), Team.Color.BLUE);
+    private final Team teamRed = new Team(new Pos(0, 101, -20).add(0.5), Team.Color.RED);
+    private final int itemCount;
+
+    private final Map<Player, Team> teams = new WeakHashMap<>();
+
+    public BlockBattle(int itemCount) {
+        super(Dimension.THE_END.key, "Block Battle", new FirstWinsScore());
+
+        this.itemCount = itemCount;
+
+        this.eventNode().addChild(
+            CombatFeatures.empty()
+                .add(CombatFeatures.VANILLA_ATTACK)
+                .add(CombatFeatures.VANILLA_DAMAGE)
+                .add(CombatFeatures.VANILLA_KNOCKBACK)
+                .build().createNode()
+        );
+
+        this.eventNode().addListener(FinalAttackEvent.class, finalAttackEvent -> {
+            if(this.isBeforeBeginning) finalAttackEvent.setCancelled(true);
+            finalAttackEvent.setBaseDamage(0);
+            ((Player) finalAttackEvent.getTarget()).setHealth(20);
+        });
+    }
+
+    @Override
+    protected void onLoad(@NotNull CompletableFuture<Void> callback) {
+        this.generatePlatform(new Pos(0, 100, 0), Block.GOLD_BLOCK, Block.YELLOW_CONCRETE_POWDER);
+        this.generatePlatform(new Pos(0, 101, 0), Block.AIR, Block.SANDSTONE_SLAB);
+        this.generatePlatform(new Pos(0, 100, 20), Block.BLUE_CONCRETE, Block.BLUE_CONCRETE_POWDER);
+        this.generatePlatform(new Pos(0, 100, -20), Block.RED_CONCRETE, Block.RED_CONCRETE_POWDER);
+        this.generatePlatform(new Pos(-5, 101, -14), Block.RED_STAINED_GLASS, Block.AIR);
+        this.generatePlatform(new Pos(5, 101, 14), Block.BLUE_STAINED_GLASS, Block.AIR);
+
+        AbsoluteBlockBatch batch = new AbsoluteBlockBatch();
+
+        Pos[] positionsRedGlass = {
+            new Pos(2, 102, -9),
+            new Pos(-1, 103, -9),
+            new Pos(-2, 104, -6),
+            new Pos(-5, 103, -7),
+            new Pos(-7, 102, -10),
+            new Pos(3, 102, -12),
+            new Pos(5, 101, -15)
+        };
+
+        Pos[] positionsBlueGlass = {
+            new Pos(-5, 101, 15),
+            new Pos(-3, 102, 12),
+            new Pos(-2, 102, 9),
+            new Pos(1, 103, 9),
+            new Pos(2, 104, 6),
+            new Pos(5, 103, 7),
+            new Pos(7, 102, 10)
+        };
+
+        for(Pos pos : positionsRedGlass)
+            batch.setBlock(pos, Block.RED_STAINED_GLASS);
+
+        for(Pos pos : positionsBlueGlass)
+            batch.setBlock(pos, Block.BLUE_STAINED_GLASS);
+
+        BatchUtil.loadAndApplyBatch(batch, this, () -> {});
+    }
+
+    @Override
+    protected void onBlockPlace(@NotNull PlayerBlockPlaceEvent playerBlockPlaceEvent) {
+        Pos posGoldBlock = new Pos(playerBlockPlaceEvent.getBlockPosition()).sub(0, 1, 0);
+        Block goldBlock = playerBlockPlaceEvent.getInstance().getBlock(posGoldBlock);
+
+        playerBlockPlaceEvent.setCancelled(goldBlock != Block.GOLD_BLOCK);
+
+        playerBlockPlaceEvent.getInstance().scheduler().scheduleNextTick(() -> {
+            Pos middle = new Pos(0, 101, 0);
+            boolean validBlue = true;
+            boolean validRed = true;
+
+            for(int x = middle.blockX()-1; x < middle.blockX()+2; x++) {
+                for(int z = middle.blockZ()-1; z < middle.blockZ()+2; z++) {
+                    if(playerBlockPlaceEvent.getInstance().getBlock(x, 101, z) != Block.BLUE_WOOL) {
+                        validBlue = false;
+                        break;
+                    }
+                }
+                if(!validBlue)
+                    break;
+            }
+
+            for(int x = middle.blockX()-1; x < middle.blockX()+2; x++) {
+                for(int z = middle.blockZ()-1; z < middle.blockZ()+2; z++) {
+                    if(playerBlockPlaceEvent.getInstance().getBlock(x, 101, z) != Block.RED_WOOL) {
+                        validRed = false;
+                        break;
+                    }
+                }
+                if(!validRed)
+                    break;
+            }
+
+            if(!validBlue && !validRed) return;
+            var winningTeam = validBlue ? Team.Color.BLUE : Team.Color.RED;
+            var winningPlayers = this.teams.entrySet().stream()
+                .filter(entry -> entry.getValue().color().equals(winningTeam))
+                .map(Map.Entry::getKey)
+                .collect(Collectors.toSet());
+
+            this.getScore().insertMultiple(winningPlayers);
+            super.stop();
+        });
+    }
+
+    @Override
+    protected void onBlockBreak(@NotNull PlayerBlockBreakEvent playerBlockBreakEvent) {
+        boolean isAllowed = Arrays.stream(Team.Color.values())
+            .map(Team.Color::getMaterial)
+            .map(Material::block)
+            .toList()
+            .contains(playerBlockBreakEvent.getBlock());
+        if(!isAllowed) playerBlockBreakEvent.setCancelled(true);
+    }
+
+    @Override
+    protected void onPlayerMove(@NotNull PlayerMoveEvent playerMoveEvent) {
+        if(playerMoveEvent.getNewPosition().y() < 95) {
+            var player = playerMoveEvent.getPlayer();
+
+            player.teleport(
+                this.isBeforeBeginning
+                    ? this.getSpawn()
+                    : this.teams.get(player).spawnPosition()
+            );
+
+            this.giveItems(player);
+        }
+    }
+
+    @Override
+    protected void onStart() {
+        this.setTeams();
+        this.getPlayers().forEach(player -> player.teleport(this.teams.get(player).spawnPosition()).thenRun(() -> {
+            this.giveItems(player);
+            player.setGameMode(GameMode.SURVIVAL);
+        }));
+    }
+
+    private void generatePlatform(Pos center, Block inner, Block outer) {
+        for(int x = center.blockX()-2; x < center.blockX()+3; x++) {
+            for(int z = center.blockZ()-2; z < center.blockZ()+3; z++) {
+                this.setBlock(x, center.blockY(), z, outer);
+            }
+        }
+
+        for(int x = center.blockX()-1; x < center.blockX()+2; x++) {
+            for(int z = center.blockZ()-1; z < center.blockZ()+2; z++) {
+                this.setBlock(x, center.blockY(), z, inner);
+            }
+        }
+    }
+
+    private void setTeams() {
+        List<Player> players = new ArrayList<>(this.getPlayers());
+        Collections.shuffle(players);
+        int halfPlayers = players.size()/2;
+        players.subList(0, halfPlayers).forEach(player -> this.teams.put(player, this.teamBlue));
+        players.subList(halfPlayers, players.size()).forEach(player -> this.teams.put(player, this.teamRed));
+    }
+
+    @Override
+    public Pos getSpawn() {
+        return new Pos(0, 101, 0).add(0.5);
+    }
+
+    private void giveItems(Player player) {
+        player.getInventory().clear();
+        ItemStack item = ItemStack.of(
+            this.teams.get(player).color().getMaterial(),
+            this.itemCount
+        );
+        player.getInventory().addItemStack(item);
+    }
+}

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/blockBattle/BlockBattleFactory.java

@@ -0,0 +1,40 @@
+package eu.mhsl.minenet.minigames.instance.game.stateless.types.blockBattle;
+
+import eu.mhsl.minenet.minigames.instance.game.Game;
+import eu.mhsl.minenet.minigames.instance.game.stateless.config.ConfigManager;
+import eu.mhsl.minenet.minigames.instance.game.stateless.config.GameFactory;
+import eu.mhsl.minenet.minigames.instance.game.stateless.config.Option;
+import eu.mhsl.minenet.minigames.instance.game.stateless.config.common.NumericOption;
+import eu.mhsl.minenet.minigames.instance.room.Room;
+import eu.mhsl.minenet.minigames.message.component.TranslatedComponent;
+import net.minestom.server.item.Material;
+
+import java.util.Map;
+
+public class BlockBattleFactory implements GameFactory {
+    @Override
+    public TranslatedComponent name() {
+        return TranslatedComponent.byId("game_BlockBattle#name");
+    }
+
+    @Override
+    public TranslatedComponent description() {
+        return TranslatedComponent.byId("game_BlockBattle#description");
+    }
+
+    @Override
+    public ConfigManager configuration() {
+        return new ConfigManager()
+            .addOption(new NumericOption("itemCount", Material.WHITE_WOOL, TranslatedComponent.byId("game_BlockBattle#itemCount"), 1, 2, 3));
+    }
+
+    @Override
+    public Material symbol() {
+        return Material.GREEN_CONCRETE;
+    }
+
+    @Override
+    public Game manufacture(Room parent, Map<String, Option<?>> configuration) throws Exception {
+        return new BlockBattle(configuration.get("itemCount").getAsInt()).setParent(parent);
+    }
+}

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/blockBattle/Team.java

@@ -0,0 +1,21 @@
+package eu.mhsl.minenet.minigames.instance.game.stateless.types.blockBattle;
+
+import net.minestom.server.coordinate.Pos;
+import net.minestom.server.item.Material;
+
+public record Team(Pos spawnPosition, Color color) {
+    public enum Color {
+        RED(Material.RED_WOOL),
+        BLUE(Material.BLUE_WOOL);
+
+        private final Material block;
+
+        Color(Material block) {
+            this.block = block;
+        }
+
+        public Material getMaterial() {
+            return this.block;
+        }
+    }
+}

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/boatRace/BoatRace.java

@@ -0,0 +1,75 @@
+package eu.mhsl.minenet.minigames.instance.game.stateless.types.boatRace;
+
+import eu.mhsl.minenet.minigames.Resource;
+import eu.mhsl.minenet.minigames.handler.global.PlayerLoginHandler;
+import eu.mhsl.minenet.minigames.instance.Dimension;
+import eu.mhsl.minenet.minigames.instance.game.stateless.StatelessGame;
+import eu.mhsl.minenet.minigames.score.FirstWinsScore;
+import eu.mhsl.minenet.minigames.util.CommonProperties;
+import net.minestom.server.MinecraftServer;
+import net.minestom.server.coordinate.Pos;
+import net.minestom.server.entity.Entity;
+import net.minestom.server.entity.EntityType;
+import net.minestom.server.entity.GameMode;
+import net.minestom.server.entity.Player;
+import net.minestom.server.event.player.PlayerMoveEvent;
+import net.minestom.server.instance.anvil.AnvilLoader;
+import net.minestom.server.instance.block.Block;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.concurrent.CompletableFuture;
+
+
+public class BoatRace extends StatelessGame {
+    public BoatRace() {
+        super(Dimension.OVERWORLD.key, "boatRace", new FirstWinsScore());
+        this.setChunkLoader(new AnvilLoader(Resource.GAME_MAP.getPath().resolve("boatRace/woodlandMansion")));
+    }
+
+    @Override
+    protected boolean onPlayerJoin(Player p) {
+        Entity boat = new Entity(EntityType.OAK_BOAT);
+        boat.setInstance(this, this.getSpawn());
+        boat.setSynchronizationTicks(100000);
+        PlayerLoginHandler.globalTeam.addMember(boat.getUuid().toString());
+        MinecraftServer.getSchedulerManager().scheduleNextTick(() -> boat.addPassenger(p));
+        return super.onPlayerJoin(p);
+    }
+
+    @Override
+    protected void onLoad(@NotNull CompletableFuture<Void> callback) {
+        for(int z = 9; z <= 32; z++) {
+            this.setBlock(31, 235, z, Block.CHERRY_FENCE.withProperties(CommonProperties.fenceNorthSouth));
+        }
+    }
+
+    @Override
+    protected void onStart() {
+        for(int z = 9; z <= 32; z++) {
+            this.setBlock(31, 235, z, Block.AIR);
+        }
+    }
+
+    @Override
+    protected void onPlayerMove(@NotNull PlayerMoveEvent event) {
+        if (this.isBeforeBeginning) return;
+
+        if(event.getNewPosition().z() > 469) {
+            Player player = event.getPlayer();
+            this.getScore().insertResult(player);
+
+            Entity vehicle = player.getVehicle();
+            if(vehicle != null) {
+                vehicle.removePassenger(player);
+                player.teleport(player.getPosition().withY(y -> y + 3));
+                player.setGameMode(GameMode.SPECTATOR);
+                vehicle.remove();
+            }
+        }
+    }
+
+    @Override
+    public Pos getSpawn() {
+        return new Pos(20, 236, 20, -90, 0);
+    }
+}

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/boatRace/BoatRaceFactory.java

@@ -0,0 +1,27 @@
+package eu.mhsl.minenet.minigames.instance.game.stateless.types.boatRace;
+
+import eu.mhsl.minenet.minigames.instance.game.Game;
+import eu.mhsl.minenet.minigames.instance.game.stateless.config.GameFactory;
+import eu.mhsl.minenet.minigames.instance.game.stateless.config.Option;
+import eu.mhsl.minenet.minigames.instance.room.Room;
+import eu.mhsl.minenet.minigames.message.component.TranslatedComponent;
+import net.minestom.server.item.Material;
+
+import java.util.Map;
+
+public class BoatRaceFactory implements GameFactory {
+    @Override
+    public TranslatedComponent name() {
+        return TranslatedComponent.byId("game_BoatRace#name");
+    }
+
+    @Override
+    public Material symbol() {
+        return Material.OAK_BOAT;
+    }
+
+    @Override
+    public Game manufacture(Room parent, Map<String, Option<?>> configuration) throws Exception {
+        return new BoatRace().setParent(parent);
+    }
+}

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/colorJump/ColorJump.java

@@ -0,0 +1,170 @@
+package eu.mhsl.minenet.minigames.instance.game.stateless.types.colorJump;
+
+import eu.mhsl.minenet.minigames.instance.Dimension;
+import eu.mhsl.minenet.minigames.instance.game.stateless.StatelessGame;
+import eu.mhsl.minenet.minigames.score.LastWinsScore;
+import eu.mhsl.minenet.minigames.util.BatchUtil;
+import eu.mhsl.minenet.minigames.world.generator.terrain.CircularPlateTerrainGenerator;
+import net.minestom.server.MinecraftServer;
+import net.minestom.server.coordinate.Pos;
+import net.minestom.server.entity.GameMode;
+import net.minestom.server.event.inventory.InventoryPreClickEvent;
+import net.minestom.server.event.player.PlayerMoveEvent;
+import net.minestom.server.instance.batch.AbsoluteBlockBatch;
+import net.minestom.server.instance.block.Block;
+import net.minestom.server.item.ItemStack;
+import net.minestom.server.timer.TaskSchedule;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ThreadLocalRandom;
+
+public class ColorJump extends StatelessGame {
+    private final List<Block> blocks = List.of(
+        Block.RED_CONCRETE,
+        Block.ORANGE_CONCRETE,
+        Block.YELLOW_CONCRETE,
+        Block.LIME_CONCRETE,
+        Block.LIGHT_BLUE_CONCRETE,
+        Block.BLUE_CONCRETE,
+        Block.PURPLE_CONCRETE,
+        Block.PINK_CONCRETE
+    );
+    private Block currentBlock;
+    private Block blockLastRound;
+    private double roundTime = 5;
+    private final double multiplierNextRoundTime = 0.9;
+
+    public ColorJump() {
+        super(Dimension.THE_END.key, "ColorJump", new LastWinsScore());
+        this.getScore().setIgnoreLastPlayers(1);
+
+        this.setGenerator(new CircularPlateTerrainGenerator(100));
+
+        this.eventNode().addListener(
+            InventoryPreClickEvent.class,
+            inventoryPreClickEvent -> inventoryPreClickEvent.setCancelled(true)
+        );
+    }
+
+    @Override
+    protected void onLoad(@NotNull CompletableFuture<Void> callback) {
+        this.generate();
+    }
+
+    @Override
+    protected void onStart() {
+        this.nextRound();
+    }
+
+    private void nextRound() {
+        this.generate();
+        do {
+            this.currentBlock = this.blocks.get(ThreadLocalRandom.current().nextInt(this.blocks.size()));
+        } while(this.currentBlock == this.blockLastRound);
+        this.blockLastRound = this.currentBlock;
+
+        ItemStack item = ItemStack.of(Objects.requireNonNull(this.currentBlock.registry().material()));
+        this.getPlayers().forEach(player -> {
+            player.getInventory().clear();
+            for(int i = 0; i < 9; i++) {
+                player.getInventory().setItemStack(i, item);
+            }
+        });
+
+        var scheduler = MinecraftServer.getSchedulerManager();
+        TaskSchedule stop = TaskSchedule.stop();
+
+        scheduler.scheduleTask(() -> {
+            if(!this.isRunning) return stop;
+            this.destroyAllExcept(this.currentBlock);
+
+            scheduler.scheduleTask(() -> {
+                if(this.isRunning) this.nextRound();
+                return stop;
+            }, TaskSchedule.seconds(3));
+            return stop;
+        }, TaskSchedule.seconds((long) this.roundTime));
+        this.roundTime = this.roundTime * this.multiplierNextRoundTime;
+        if(this.roundTime <= 1) this.roundTime = 1;
+
+        long totalTicks = (long) (this.roundTime * 20);
+        final long[] remainingTicks = { totalTicks };
+
+        scheduler.scheduleTask(() -> {
+
+            if (!this.isRunning)
+                return stop;
+
+            if (remainingTicks[0] <= 0) {
+                this.getPlayers().forEach(player -> {
+                    player.setExp(0f);
+                    player.setLevel(0);
+                });
+                return stop;
+            }
+
+            float progress = (float) remainingTicks[0] / totalTicks;
+
+            this.getPlayers().forEach(player -> {
+                player.setExp(progress);
+                player.setLevel((int) Math.ceil(remainingTicks[0] / 20.0));
+            });
+
+            remainingTicks[0]--;
+            return TaskSchedule.tick(1);
+        }, TaskSchedule.tick(1));
+    }
+
+    private void generate() {
+        int y = 30;
+        AbsoluteBlockBatch batch = new AbsoluteBlockBatch();
+
+        for (int x = -20; x <= 21; x += 2) {
+            for (int z = -11; z <= 10; z += 2) {
+                Block randomBlock = this.blocks.get(ThreadLocalRandom.current().nextInt(this.blocks.size()));
+
+                for (int dx = 0; dx < 2; dx++) {
+                    for (int dz = 0; dz < 2; dz++) {
+                        batch.setBlock(x + dx, y, z + dz, randomBlock);
+                    }
+                }
+            }
+        }
+        BatchUtil.loadAndApplyBatch(batch, this, () -> {});
+    }
+
+    private void destroyAllExcept(Block block) {
+        AbsoluteBlockBatch batch = new AbsoluteBlockBatch();
+        int y = 30;
+
+        for (int x = -20; x <= 21; x++) {
+            for(int z = -11; z <= 10; z++) {
+                Pos blockPos = new Pos(x, y, z);
+                if(this.getBlock(blockPos) != block)
+                    batch.setBlock(blockPos, Block.AIR);
+            }
+        }
+        BatchUtil.loadAndApplyBatch(batch, this, () -> {});
+    }
+
+    @Override
+    public Pos getSpawn() {
+        return new Pos(0, 31, 0);
+    }
+
+    @Override
+    protected void onPlayerMove(@NotNull PlayerMoveEvent playerMoveEvent) {
+        var player = playerMoveEvent.getPlayer();
+
+        if(playerMoveEvent.getNewPosition().y() >= 29)
+            return;
+        player.teleport(this.getSpawn());
+        if(this.isRunning) {
+            this.getScore().insertResult(player);
+            player.setGameMode(GameMode.SPECTATOR);
+        }
+    }
+}

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/colorJump/ColorJumpFactory.java

@@ -0,0 +1,33 @@
+package eu.mhsl.minenet.minigames.instance.game.stateless.types.colorJump;
+
+import eu.mhsl.minenet.minigames.instance.game.Game;
+import eu.mhsl.minenet.minigames.instance.game.stateless.config.GameFactory;
+import eu.mhsl.minenet.minigames.instance.game.stateless.config.Option;
+import eu.mhsl.minenet.minigames.instance.room.Room;
+import eu.mhsl.minenet.minigames.message.component.TranslatedComponent;
+import net.minestom.server.item.Material;
+
+import java.util.Map;
+
+public class ColorJumpFactory implements GameFactory {
+
+    @Override
+    public TranslatedComponent name() {
+        return TranslatedComponent.byId("game_ColorJump#name");
+    }
+
+    @Override
+    public Material symbol() {
+        return Material.PINK_CONCRETE;
+    }
+
+    @Override
+    public TranslatedComponent description() {
+        return TranslatedComponent.byId("game_ColorJump#description");
+    }
+
+    @Override
+    public Game manufacture(Room parent, Map<String, Option<?>> configuration) throws Exception {
+        return new ColorJump().setParent(parent);
+    }
+}

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/elytraRace/ElytraRace.java

@@ -133,7 +133,7 @@ public class ElytraRace extends StatelessGame {
             return;
         }
 
-        this.playerCheckpoints.putIfAbsent(player, new CheckPointData(this.ringSpacing, this.ringSpacing * 2));
+        this.playerCheckpoints.putIfAbsent(player, new CheckPointData(0, this.ringSpacing));
 
         if(newPos.z() > this.generatedUntil - this.ringSpacing) {
             this.generateRing(this.generatedUntil + this.ringSpacing);
@@ -224,7 +224,9 @@ public class ElytraRace extends StatelessGame {
     }
 
     private void toCheckpoint(Player p) {
+        CheckPointData data = this.playerCheckpoints.get(p);
         Point checkpointPos = this.getRingPositionAtZ(this.playerCheckpoints.get(p).currentCheckpoint);
+        if(data.currentCheckpoint == 0) checkpointPos = this.getSpawn().add(0, 3, 0);
         p.setVelocity(Vec.ZERO);
         p.setFlyingWithElytra(false);
         p.teleport(Pos.fromPoint(checkpointPos).add(0.5, 0, 0.5));

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/pillars/Pillars.java

@@ -0,0 +1,103 @@
+package eu.mhsl.minenet.minigames.instance.game.stateless.types.pillars;
+
+import eu.mhsl.minenet.minigames.instance.Dimension;
+import eu.mhsl.minenet.minigames.instance.game.stateless.StatelessGame;
+import eu.mhsl.minenet.minigames.score.LastWinsScore;
+import eu.mhsl.minenet.minigames.util.Position;
+import io.github.togar2.pvp.feature.CombatFeatures;
+import net.minestom.server.MinecraftServer;
+import net.minestom.server.coordinate.Pos;
+import net.minestom.server.entity.GameMode;
+import net.minestom.server.entity.Player;
+import net.minestom.server.event.item.ItemDropEvent;
+import net.minestom.server.event.player.PlayerBlockBreakEvent;
+import net.minestom.server.event.player.PlayerBlockPlaceEvent;
+import net.minestom.server.event.player.PlayerMoveEvent;
+import net.minestom.server.instance.block.Block;
+import net.minestom.server.item.ItemStack;
+import net.minestom.server.item.Material;
+import net.minestom.server.timer.TaskSchedule;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+import java.util.concurrent.ThreadLocalRandom;
+
+class Pillars extends StatelessGame {
+    private int spawnPosx = 0;
+    private int spawnPosz = 0;
+    private final int pillarSpacing = 10;
+    private final int pillarRowCount = 5;
+
+    public Pillars() {
+        super(Dimension.THE_END.key, "Pillars", new LastWinsScore());
+        this.getScore().setIgnoreLastPlayers(1);
+
+        this.eventNode().addChild(
+            CombatFeatures.empty()
+                .add(CombatFeatures.VANILLA_ATTACK)
+                .add(CombatFeatures.VANILLA_DAMAGE)
+                .add(CombatFeatures.VANILLA_KNOCKBACK)
+                .build().createNode()
+        );
+    }
+
+    @Override
+    protected boolean onPlayerJoin(Player p) {
+        Pos pos = new Pos(this.spawnPosx * this.pillarSpacing, 100, this.spawnPosz * this.pillarSpacing);
+        this.setBlock(pos.sub(0, 1, 0), Block.BEDROCK);
+
+        if(this.spawnPosx >= this.pillarRowCount) {
+            this.spawnPosx = 0;
+            this.spawnPosz++;
+        }
+        this.spawnPosx++;
+        MinecraftServer.getSchedulerManager().scheduleNextTick(() -> p.teleport(pos.add(0.5, 0, 0.5)));
+
+        return super.onPlayerJoin(p);
+    }
+
+    @Override
+    protected void onBlockPlace(@NotNull PlayerBlockPlaceEvent playerBlockPlaceEvent) {}
+
+    @Override
+    protected void onBlockBreak(@NotNull PlayerBlockBreakEvent playerBlockBreakEvent) {}
+
+    @Override
+    protected void onItemDrop(@NotNull ItemDropEvent itemDropEvent) {}
+
+    @Override
+    public Pos getSpawn() {
+        return new Pos(0, 105, 0);
+    }
+
+    @Override
+    protected void onPlayerMove(@NotNull PlayerMoveEvent playerMoveEvent) {
+        var player = playerMoveEvent.getPlayer();
+
+        if(this.isBeforeBeginning && Position.hasPositionChanged(player.getPosition(), playerMoveEvent.getNewPosition()))
+            playerMoveEvent.setCancelled(true);
+
+        if(playerMoveEvent.getNewPosition().y() < 80) {
+            this.getScore().insertResult(player);
+            player.teleport(this.getSpawn());
+            player.setGameMode(GameMode.SPECTATOR);
+        }
+    }
+
+    @Override
+    protected void onStart() {
+        this.getPlayers().forEach(player -> player.setGameMode(GameMode.SURVIVAL));
+
+        MinecraftServer.getSchedulerManager().submitTask(() -> {
+            List<Material> materials = Material.values().stream()
+                .filter(material -> !material.equals(Material.AIR))
+                .toList();
+            this.getPlayers().forEach(player -> {
+                ItemStack item = ItemStack.of(materials.get(ThreadLocalRandom.current().nextInt(Material.values().toArray().length)));
+                player.getInventory().addItemStack(item);
+            });
+
+            return TaskSchedule.seconds(5);
+        });
+    }
+}

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/pillars/PillarsFactory.java

@@ -0,0 +1,32 @@
+package eu.mhsl.minenet.minigames.instance.game.stateless.types.pillars;
+
+import eu.mhsl.minenet.minigames.instance.game.Game;
+import eu.mhsl.minenet.minigames.instance.game.stateless.config.GameFactory;
+import eu.mhsl.minenet.minigames.instance.game.stateless.config.Option;
+import eu.mhsl.minenet.minigames.instance.room.Room;
+import eu.mhsl.minenet.minigames.message.component.TranslatedComponent;
+import net.minestom.server.item.Material;
+
+import java.util.Map;
+
+public class PillarsFactory implements GameFactory {
+    @Override
+    public TranslatedComponent name() {
+        return TranslatedComponent.byId("game_Pillars#name");
+    }
+
+    @Override
+    public TranslatedComponent description() {
+        return TranslatedComponent.byId("game_Pillars#description");
+    }
+
+    @Override
+    public Material symbol() {
+        return Material.BEDROCK;
+    }
+
+    @Override
+    public Game manufacture(Room parent, Map<String, Option<?>> configuration) throws Exception {
+        return new Pillars().setParent(parent);
+    }
+}

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/spaceSnake/SpaceSnake.java

@@ -110,7 +110,7 @@ public class SpaceSnake extends StatelessGame {
             playerMoveEvent.getPlayer().teleport(this.getSpawn());
             playerMoveEvent.getPlayer().setGameMode(GameMode.SPECTATOR);
             long livingPlayers = this.getPlayers().stream()
-                .filter(p -> this.getScore().hasResult(p))
+                .filter(p -> !this.getScore().hasResult(p))
                 .count();
             if(livingPlayers == 1) this.setTimeLimit(10);
             if(livingPlayers == 0) this.stop();

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/stickfight/StickFightFactory.java

@@ -28,7 +28,8 @@ public class StickFightFactory implements GameFactory {
     @Override
     public ConfigManager configuration() {
         return new ConfigManager()
-            .addOption(new NumericOption("length", Material.SANDSTONE, TranslatedComponent.byId("optionCommon#length"), 7, 10, 13, 16, 19));
+            .addOption(new NumericOption("length", Material.SANDSTONE, TranslatedComponent.byId("optionCommon#length"), 7, 10, 13, 16, 19))
+            .addOption(new NumericOption("seconds", Material.CLOCK, TranslatedComponent.byId("optionCommon#seconds"), 30, 60, 90, 120));
     }
 
     @Override
@@ -40,7 +41,7 @@ public class StickFightFactory implements GameFactory {
 
     @Override
     public Game manufacture(Room parent, Map<String, Option<?>> configuration) {
-        return new Stickfight(configuration.get("length").getAsInt()).setParent(parent);
+        return new Stickfight(configuration.get("length").getAsInt(), configuration.get("seconds").getAsInt()).setParent(parent);
     }
 
     @Override

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/stickfight/Stickfight.java

@@ -10,6 +10,8 @@ import net.minestom.server.coordinate.Pos;
 import net.minestom.server.entity.Player;
 import net.minestom.server.event.player.PlayerMoveEvent;
 import net.minestom.server.instance.block.Block;
+import net.minestom.server.item.ItemStack;
+import net.minestom.server.item.Material;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
@@ -22,10 +24,12 @@ public class Stickfight extends StatelessGame {
     private final WeakHashMap<Player, Pos> spawnPoints = new WeakHashMap<>();
     private final Map<Player, Integer> scoreMap = new WeakHashMap<>();
     private boolean countdownStarted = false;
+    private final int seconds;
 
-    public Stickfight(int length) {
+    public Stickfight(int length, int seconds) {
         super(Dimension.OVERWORLD.key, "Stickfight", new LowestPointsWinScore());
         this.radius = length;
+        this.seconds = seconds;
 
         this.eventNode().addChild(
             CombatFeatures.empty()
@@ -79,10 +83,18 @@ public class Stickfight extends StatelessGame {
             this.generateBridge(spawnX, spawnY, spawnZ);
         }
 
+        ItemStack item = ItemStack.of(Material.STICK).withGlowing(true);
+        players.forEach(player -> player.getInventory().addItemStack(item));
+
         this.setBlock(0, 50, 0, Block.GOLD_BLOCK);
         super.start();
     }
 
+    @Override
+    protected void onStart() {
+        this.setTimeLimit(this.seconds);
+    }
+
     @Override
     protected void onStop() {
         this.scoreMap.forEach((player, score) -> this.getScore().insertResult(player, score));
@@ -117,6 +129,7 @@ public class Stickfight extends StatelessGame {
             player.teleport(this.spawnPoints.get(player));
             this.scoreMap.putIfAbsent(player, 0);
             this.scoreMap.put(player, this.scoreMap.get(player) + 1);
+            player.setLevel(this.scoreMap.get(player));
         }
     }
 

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

@@ -6,16 +6,20 @@ import eu.mhsl.minenet.minigames.instance.game.stateless.types.tetris.game.Tetri
 import eu.mhsl.minenet.minigames.instance.game.stateless.types.tetris.game.Tetromino;
 import eu.mhsl.minenet.minigames.score.PointsWinScore;
 import net.kyori.adventure.text.Component;
+import net.minestom.server.MinecraftServer;
 import net.minestom.server.coordinate.Pos;
 import net.minestom.server.entity.Entity;
+import net.minestom.server.entity.EntityType;
 import net.minestom.server.entity.GameMode;
 import net.minestom.server.entity.Player;
+import net.minestom.server.entity.metadata.display.BlockDisplayMeta;
 import net.minestom.server.event.player.PlayerHandAnimationEvent;
-import net.minestom.server.event.player.PlayerMoveEvent;
 import net.minestom.server.event.player.PlayerTickEvent;
 import net.minestom.server.event.player.PlayerUseItemEvent;
+import net.minestom.server.instance.block.Block;
 import net.minestom.server.item.ItemStack;
 import net.minestom.server.item.Material;
+import net.minestom.server.timer.TaskSchedule;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Map;
@@ -71,21 +75,29 @@ class Tetris extends StatelessGame {
     @Override
     protected void onPlayerLeave(Player p) {
         this.tetrisGames.get(p).sidebar.removeViewer(p);
+        p.clearEffects();
         this.letPlayerLoose(p);
+        p.setGameMode(GameMode.SURVIVAL);
     }
 
-    @Override
-    protected void onPlayerMove(@NotNull PlayerMoveEvent event) {
+    private void onPlayerInteract(@NotNull PlayerUseItemEvent event) {
+        event.setItemUseTime(0);
+        this.tetrisGames.get(event.getPlayer()).pressedButton(TetrisGame.Button.mouseRight);
+    }
+
+    private void onPlayerAttack(@NotNull PlayerHandAnimationEvent event) {
+        this.tetrisGames.get(event.getPlayer()).pressedButton(TetrisGame.Button.mouseLeft);
+    }
+
+    private void onPlayerTick(PlayerTickEvent event) {
         Player player = event.getPlayer();
-        Pos currentPosition = event.getNewPosition();
-
         TetrisGame tetrisGame = this.tetrisGames.get(player);
-
-        if(tetrisGame == null) {
-            event.setCancelled(true);
+        if(tetrisGame == null) return;
+        if(tetrisGame.lost) {
+            this.letPlayerLoose(player);
             return;
         }
-        if(tetrisGame.lost) return;
+
         if(player.getGameMode() == GameMode.SPECTATOR) return;
 
         if(player.inputs().forward()) tetrisGame.pressedButton(TetrisGame.Button.W);
@@ -93,26 +105,6 @@ class Tetris extends StatelessGame {
         if(player.inputs().right()) tetrisGame.pressedButton(TetrisGame.Button.D);
         if(player.inputs().left()) tetrisGame.pressedButton(TetrisGame.Button.A);
         if(player.inputs().jump()) tetrisGame.pressedButton(TetrisGame.Button.space);
-
-        event.setNewPosition(tetrisGame.getPlayerSpawnPosition().withView(currentPosition));
-        player.setSprinting(false);
-    }
-
-    protected void onPlayerInteract(@NotNull PlayerUseItemEvent event) {
-        this.tetrisGames.get(event.getPlayer()).pressedButton(TetrisGame.Button.mouseRight);
-    }
-
-    protected void onPlayerAttack(@NotNull PlayerHandAnimationEvent event) {
-        this.tetrisGames.get(event.getPlayer()).pressedButton(TetrisGame.Button.mouseLeft);
-    }
-
-    protected void onPlayerTick(PlayerTickEvent event) {
-        Player player = event.getPlayer();
-        TetrisGame tetrisGame = this.tetrisGames.get(player);
-        if(tetrisGame == null) return;
-        if(tetrisGame.lost && player.getGameMode() != GameMode.SPECTATOR) {
-            this.letPlayerLoose(player);
-        }
     }
 
     private void letPlayerLoose(Player player) {
@@ -120,6 +112,7 @@ class Tetris extends StatelessGame {
         if(!this.getScore().hasResult(player)) {
             player.setGameMode(GameMode.SPECTATOR);
             player.setInvisible(true);
+            if(player.getVehicle() != null) player.getVehicle().removePassenger(player);
             this.getScore().insertResult(player, tetrisGame.getScore());
         }
 
@@ -157,6 +150,16 @@ class Tetris extends StatelessGame {
         p.teleport(tetrisGame.getPlayerSpawnPosition());
         tetrisGame.sidebar.addViewer(p);
 
+        MinecraftServer.getSchedulerManager().scheduleTask(() -> {
+            Entity ghostBlock = new Entity(EntityType.BLOCK_DISPLAY);
+            ((BlockDisplayMeta) ghostBlock.getEntityMeta()).setBlockState(Block.AIR);
+            ghostBlock.setNoGravity(true);
+            ghostBlock.setInstance(this, tetrisGame.getPlayerSpawnPosition());
+            ghostBlock.addPassenger(p);
+            return TaskSchedule.stop();
+        }, TaskSchedule.nextTick());
+
+
         return super.onPlayerJoin(p);
     }
 

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/tetris/game/Orientation.java

@@ -0,0 +1,17 @@
+package eu.mhsl.minenet.minigames.instance.game.stateless.types.tetris.game;
+
+public enum Orientation {
+    NONE,
+    RIGHT,
+    LEFT,
+    UPSIDE_DOWN;
+
+    public Orientation rotated(boolean clockwise) {
+        return switch(this) {
+            case NONE -> clockwise ? Orientation.RIGHT : Orientation.LEFT;
+            case RIGHT -> clockwise ? Orientation.UPSIDE_DOWN : Orientation.NONE;
+            case UPSIDE_DOWN -> clockwise ? Orientation.LEFT : Orientation.RIGHT;
+            case LEFT -> clockwise ? Orientation.NONE : Orientation.UPSIDE_DOWN;
+        };
+    }
+}

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/tetris/game/RotationChecker.java

@@ -0,0 +1,53 @@
+package eu.mhsl.minenet.minigames.instance.game.stateless.types.tetris.game;
+
+import java.util.Map;
+import java.util.stream.IntStream;
+
+public final class RotationChecker {
+    private static final Map<Orientation, int[][]> STANDARD_WALL_KICKS = Map.of(
+        Orientation.NONE, new int[][] {{0,0}, {0,0}, {0,0}, {0,0}, {0,0}},
+        Orientation.RIGHT, new int[][] {{0,0}, {1,0}, {1,-1}, {0,2}, {1,2}},
+        Orientation.UPSIDE_DOWN, new int[][] {{0,0}, {0,0}, {0,0}, {0,0}, {0,0}},
+        Orientation.LEFT, new int[][] {{0,0}, {-1,0}, {-1,-1}, {0,2}, {-1,2}}
+    );
+
+    private static final Map<Orientation, int[][]> I_WALL_KICKS = Map.of(
+        Orientation.NONE, new int[][] {{0,0}, {-1,0}, {2,0}, {-1,0}, {2,0}},
+        Orientation.RIGHT, new int[][] {{-1,0}, {0,0}, {0,0}, {0,1}, {0,-2}},
+        Orientation.UPSIDE_DOWN, new int[][] {{-1,1}, {1,1}, {-2,1}, {1,0}, {-2,0}},
+        Orientation.LEFT, new int[][] {{0,1}, {0,1}, {0,1}, {0,-1}, {0,2}}
+    );
+
+    private static final Map<Orientation, int[][]> O_WALL_KICKS = Map.of(
+        Orientation.NONE, new int[][] {{0,0}},
+        Orientation.RIGHT, new int[][] {{0,-1}},
+        Orientation.UPSIDE_DOWN, new int[][] {{-1,-1}},
+        Orientation.LEFT, new int[][] {{-1,0}}
+    );
+
+    public static int[][] getKicksArray(Orientation from, Orientation to, Tetromino.Shape shape) {
+        int[][] firstOffsets = getOffsetData(from, shape);
+        int[][] secondOffsets = getOffsetData(to, shape);
+        int[][] result = new int[firstOffsets.length][2];
+
+        for(int i = 0; i < firstOffsets.length; i++) {
+            result[i] = subtractInt(firstOffsets[i], secondOffsets[i]);
+        }
+
+        return result;
+    }
+
+    private static int[] subtractInt(int[] first, int[] second) {
+        return IntStream.range(0, first.length)
+            .map(i -> first[i] - second[i])
+            .toArray();
+    }
+
+    private static int[][] getOffsetData(Orientation orientation, Tetromino.Shape shape) {
+        return switch(shape) {
+            case J, L, S, T, Z -> STANDARD_WALL_KICKS.get(orientation);
+            case I -> I_WALL_KICKS.get(orientation);
+            case O -> O_WALL_KICKS.get(orientation);
+        };
+    }
+}

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/tetris/game/TetrisGame.java

@@ -2,10 +2,9 @@ package eu.mhsl.minenet.minigames.instance.game.stateless.types.tetris.game;
 
 import eu.mhsl.minenet.minigames.instance.game.stateless.StatelessGame;
 import net.kyori.adventure.text.Component;
-import net.minestom.server.MinecraftServer;
 import net.minestom.server.coordinate.Pos;
 import net.minestom.server.scoreboard.Sidebar;
-import net.minestom.server.timer.Scheduler;
+import net.minestom.server.timer.Task;
 import net.minestom.server.timer.TaskSchedule;
 
 import java.util.*;
@@ -23,6 +22,9 @@ public class TetrisGame {
     private final Map<Button, Long> lastPresses = new HashMap<>();
     private final List<TetrisGame> otherTetrisGames = new ArrayList<>();
     private final Random random;
+    private Task tetrominoLockTask;
+    private int lockDelayResets;
+    private int currentTetrominoLowestY = Integer.MAX_VALUE;
     public boolean lost = false;
     public boolean paused = true;
     public Tetromino currentTetromino;
@@ -54,24 +56,27 @@ public class TetrisGame {
     }
 
     public void pressedButton(Button button) {
-        final int standardButtonDelay = 100;
-        final int buttonDebounce = 70;
+        final int standardButtonDelay = 95;
+        final int wsButtonDebounce = 70;
 
         if(this.lastPresses.getOrDefault(button, 0L) >= System.currentTimeMillis() - standardButtonDelay) return;
 
-        this.lastPresses.put(button, System.currentTimeMillis());
-        if(button == Button.W) this.lastPresses.put(button, System.currentTimeMillis() + buttonDebounce);
-        if(button == Button.S) this.lastPresses.put(button, System.currentTimeMillis() - buttonDebounce);
+        switch(button) {
+            case W -> this.lastPresses.put(button, System.currentTimeMillis() + wsButtonDebounce);
+            case S -> this.lastPresses.put(button, System.currentTimeMillis() - wsButtonDebounce);
+            case mouseLeft, mouseRight -> this.lastPresses.put(button, 0L);
+            default -> this.lastPresses.put(button, System.currentTimeMillis());
+        }
 
         if(this.lost || this.paused) return;
 
         switch(button) {
-            case A -> this.currentTetromino.moveLeft();
+            case A -> this.moveLeft();
             case S -> this.moveDown();
-            case D -> this.currentTetromino.moveRight();
+            case D -> this.moveRight();
             case W -> this.hardDrop();
-            case mouseLeft -> this.currentTetromino.rotate(false);
-            case mouseRight -> this.currentTetromino.rotate(true);
+            case mouseLeft -> this.rotate(false);
+            case mouseRight -> this.rotate(true);
             case space -> this.switchHold();
         }
     }
@@ -82,8 +87,7 @@ public class TetrisGame {
 
     public void start() {
         this.paused = false;
-        Scheduler scheduler = MinecraftServer.getSchedulerManager();
-        scheduler.submitTask(() -> {
+        this.instance.scheduler().submitTask(() -> {
             if(this.lost) return TaskSchedule.stop();
             int standardTickDelay = 40;
             if(this.isFast) standardTickDelay = 20;
@@ -111,9 +115,12 @@ public class TetrisGame {
 
     public void tick() {
         if(this.lost || this.paused) return;
-        if(!this.currentTetromino.moveDown()) {
-            this.setActiveTetrominoDown();
+        if(this.currentTetromino.moveDown()) {
+            this.stopTetrominoLockTask(this.currentTetromino.getYPosition() < this.currentTetrominoLowestY, false);
+        } else {
+            this.scheduleTetrominoLock();
         }
+        this.currentTetrominoLowestY = Math.min(this.currentTetrominoLowestY, this.currentTetromino.getYPosition());
     }
 
     public int getScore() {
@@ -139,33 +146,43 @@ public class TetrisGame {
         this.lost = true;
     }
 
-    private boolean moveDown() {
+    private void moveDown() {
         if(!this.currentTetromino.moveDown()) {
-            this.setActiveTetrominoDown();
-            return false;
+            this.scheduleTetrominoLock();
+            return;
         }
+        this.stopTetrominoLockTask(this.currentTetromino.getYPosition() < this.currentTetrominoLowestY, false);
         this.score += 1;
         this.updateInfo();
-        return true;
     }
 
-    private boolean hardDrop() {
+    private void moveLeft() {
+        if(this.currentTetromino.moveLeft()) this.onSuccessfulMoveOrRotate();
+    }
+
+    private void moveRight() {
+        if(this.currentTetromino.moveRight()) this.onSuccessfulMoveOrRotate();
+    }
+
+    private void rotate(boolean clockwise) {
+        if(this.currentTetromino.rotate(clockwise)) this.onSuccessfulMoveOrRotate();
+    }
+
+    private void hardDrop() {
         if(!this.currentTetromino.moveDown()) {
-            this.setActiveTetrominoDown();
-            return false;
+            this.lockActiveTetromino();
+            return;
         }
+        do {
             this.score += 2;
+        } while(this.currentTetromino.moveDown());
         this.updateInfo();
-        while(this.currentTetromino.moveDown()) {
-            this.score += 2;
-            this.updateInfo();
-        }
-        this.setActiveTetrominoDown();
-        return true;
+        this.lockActiveTetromino();
     }
 
-    private boolean switchHold() {
-        if(!this.holdPossible) return false;
+    private void switchHold() {
+        if(!this.holdPossible) return;
+        this.stopTetrominoLockTask(true);
 
         Tetromino newCurrentTetromino;
         if(this.holdTetromino == null) {
@@ -181,6 +198,7 @@ public class TetrisGame {
         this.holdTetromino = new Tetromino(this.instance, this.currentTetromino.getShape());
         this.currentTetromino = newCurrentTetromino;
 
+        this.currentTetrominoLowestY = Integer.MAX_VALUE;
         this.currentTetromino.setPosition(this.tetrominoSpawnPosition);
         this.currentTetromino.draw();
         if(!this.currentTetromino.moveDown()) this.loose();
@@ -189,7 +207,12 @@ public class TetrisGame {
         this.holdTetromino.setPosition(this.holdPosition.add(xChange, 0, 0));
         this.holdTetromino.drawAsEntities();
         this.holdPossible = false;
-        return true;
+    }
+
+    private void onSuccessfulMoveOrRotate() {
+        if(!this.currentTetromino.isGrounded()) return;
+        this.stopTetrominoLockTask(false);
+        this.scheduleTetrominoLock();
     }
 
     private void updateNextTetrominoes() {
@@ -235,11 +258,39 @@ public class TetrisGame {
         this.sidebar.updateLineScore("2", this.level);
     }
 
-    private void setActiveTetrominoDown() {
+    private void scheduleTetrominoLock() {
+        if(this.tetrominoLockTask == null || !this.tetrominoLockTask.isAlive())
+            this.tetrominoLockTask = this.instance.scheduler().scheduleTask(() -> {
+                if(this.currentTetromino.isGrounded()) {
+                    this.lockActiveTetromino();
+                } else {
+                    this.stopTetrominoLockTask(false, false);
+                }
+                return TaskSchedule.stop();
+            }, TaskSchedule.millis(500));
+    }
+
+    private void stopTetrominoLockTask(boolean resetHard) {
+        this.stopTetrominoLockTask(resetHard, true);
+    }
+
+    private void stopTetrominoLockTask(boolean resetHard, boolean addToResets) {
+        if(resetHard) this.lockDelayResets = 0;
+
+        if(this.lockDelayResets >= 15 && addToResets) {
+            this.lockActiveTetromino();
+            return;
+        }
+        if(this.tetrominoLockTask != null) {
+            this.tetrominoLockTask.cancel();
+            this.tetrominoLockTask = null;
+            if(!resetHard && addToResets) this.lockDelayResets++;
+        }
+    }
+
+    private void lockActiveTetromino() {
+        this.stopTetrominoLockTask(true);
         this.currentTetromino.removeOwnEntities();
-        this.currentTetromino = this.nextTetrominoes.removeFirst();
-        this.currentTetromino.remove();
-        this.updateNextTetrominoes();
 
         int removedLines = this.playfield.removeFullLines();
         int combatLines = 0;
@@ -297,6 +348,11 @@ public class TetrisGame {
 
         this.updateInfo();
 
+        this.currentTetromino = this.nextTetrominoes.removeFirst();
+        this.currentTetromino.remove();
+        this.updateNextTetrominoes();
+        this.currentTetrominoLowestY = Integer.MAX_VALUE;
+
         this.currentTetromino.setPosition(this.tetrominoSpawnPosition);
         this.currentTetromino.draw();
         if(!this.currentTetromino.moveDown()) {

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/tetris/game/Tetromino.java

@@ -8,14 +8,12 @@ import net.minestom.server.entity.metadata.other.FallingBlockMeta;
 import net.minestom.server.instance.block.Block;
 import net.minestom.server.tag.Tag;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 
 public class Tetromino {
     private final static EntityType ghostEntityType = EntityType.FALLING_BLOCK;
     private final static Tag<String> uuidTag = Tag.String("uuid");
+    private Orientation orientation = Orientation.NONE;
     private final Shape shape;
     private final StatelessGame instance;
     private final UUID uuid;
@@ -28,10 +26,10 @@ public class Tetromino {
         this.uuid = UUID.randomUUID();
 
         switch(this.shape) {
-            case I -> this.shapeArray = new int[][]{{0, 0, 0, 0}, {1, 1, 1, 1}, {0, 0, 0, 0}, {0, 0, 0, 0}};
+            case I -> this.shapeArray = new int[][]{{0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}, {0, 1, 1, 1, 1}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}};
             case J -> this.shapeArray = new int[][]{{1, 0, 0}, {1, 1, 1}, {0, 0, 0}};
             case L -> this.shapeArray = new int[][]{{0, 0, 1}, {1, 1, 1}, {0, 0, 0}};
-            case O -> this.shapeArray = new int[][]{{1, 1}, {1, 1}};
+            case O -> this.shapeArray = new int[][]{{0, 1, 1}, {0, 1, 1}, {0, 0, 0}};
             case S -> this.shapeArray = new int[][]{{0, 1, 1}, {1, 1, 0}, {0, 0, 0}};
             case T -> this.shapeArray = new int[][]{{0, 1, 0}, {1, 1, 1}, {0, 0, 0}};
             case Z -> this.shapeArray = new int[][]{{1, 1, 0}, {0, 1, 1}, {0, 0, 0}};
@@ -43,12 +41,23 @@ public class Tetromino {
     }
 
     public void setPosition(Pos newPosition) {
-        this.position = newPosition;
+        this.position = new Pos(newPosition.x(), newPosition.y(), newPosition.z());
     }
 
     public boolean rotate(boolean clockwise) {
         int[][] newShapeArray = this.getTurnedShapeArray(clockwise);
-        return this.checkCollisionAndMove(this.position, newShapeArray);
+        Orientation newOrientation = this.orientation.rotated(clockwise);
+
+        int[][] kicksArray = RotationChecker.getKicksArray(this.orientation, newOrientation, this.shape);
+        for(int[] k : kicksArray) {
+            Pos candidate = new Pos(this.position.x() + k[0], this.position.y() + k[1], this.position.z());
+            if(this.checkCollisionAndMove(candidate, newShapeArray)) {
+                this.orientation = newOrientation;
+                return true;
+            }
+        }
+
+        return false;
     }
 
     public boolean moveDown() {
@@ -73,7 +82,7 @@ public class Tetromino {
     public void draw(boolean withGhost) {
         if(withGhost) {
             Pos ghostPos = this.position;
-            while(!this.checkCollision(ghostPos.sub(0, 1, 0), this.shapeArray)) {
+            while(!this.hasCollision(ghostPos.sub(0, 1, 0), this.shapeArray)) {
                 ghostPos = ghostPos.sub(0, 1, 0);
             }
             Pos positionChange = this.position.sub(ghostPos);
@@ -182,7 +191,7 @@ public class Tetromino {
 
     private boolean isPartOfTetromino(Pos position) {
         return this.getBlockPositions().stream()
-            .anyMatch(pos -> pos.equals(position));
+            .anyMatch(pos -> pos.sameBlock(position));
     }
 
     private List<Pos> getBlockPositions() {
@@ -198,10 +207,10 @@ public class Tetromino {
         for(int x = 0; x < arrayLength; x++) {
             for(int y = 0; y < arrayLength; y++) {
                 if(shapeArray[arrayLength - 1 - y][x] == 1) {
-                    switch(this.shape) {
-                        case I -> returnList.add(position.add(x - 1, y - 2, 0));
-                        case O -> returnList.add(position.add(x, y, 0));
-                        default -> returnList.add(position.add(x - 1, y - 1, 0));
+                    if(Objects.requireNonNull(this.shape) == Shape.I) {
+                        returnList.add(position.add(x - 2, y - 2, 0));
+                    } else {
+                        returnList.add(position.add(x - 1, y - 1, 0));
                     }
                 }
             }
@@ -210,7 +219,7 @@ public class Tetromino {
         return returnList;
     }
 
-    private boolean checkCollision(Pos newPosition, int[][] newShapeArray) {
+    private boolean hasCollision(Pos newPosition, int[][] newShapeArray) {
         List<Pos> newBlockPositions = this.getBlockPositions(newPosition, newShapeArray);
 
         for(Pos pos : newBlockPositions) {
@@ -222,15 +231,21 @@ public class Tetromino {
         return false;
     }
 
+    public boolean isGrounded() {
+        return this.hasCollision(this.position.sub(0, 1, 0), this.shapeArray);
+    }
+
     private boolean checkCollisionAndMove(Pos newPosition, int[][] newShapeArray) {
-        if(!this.checkCollision(newPosition, newShapeArray)) {
+        if(this.hasCollision(newPosition, newShapeArray)) return false;
         this.remove();
         this.shapeArray = Arrays.stream(newShapeArray).map(int[]::clone).toArray(int[][]::new);
         this.setPosition(newPosition);
         this.draw();
         return true;
     }
-        return false;
+
+    public int getYPosition() {
+        return Math.toIntExact(Math.round(this.position.y()));
     }
 
     public enum Shape {

src/main/java/eu/mhsl/minenet/minigames/score/Score.java

@@ -30,6 +30,11 @@ public abstract class Score {
         throw new NotImplementedException("This Score type is not able to process points");
     }
 
+    public void insertMultiple(Set<Player> p) {
+        p.forEach(player -> this.insertResultProcessor(player, () -> {}));
+        this.insertResultImplementation(p);
+    }
+
     public void insertResult(Player p) {
         this.insertResultProcessor(p, () -> this.insertResultImplementation(Set.of(p)));
     }

src/main/java/eu/mhsl/minenet/minigames/score/tournament/Tournament.java

@@ -54,18 +54,18 @@ public class Tournament {
     }
 
     public List<Set<Player>> getPlaces() {
-        List<Set<Player>> players = new ArrayList<>(
-            this.getGameScores().entrySet().stream()
+        Map<Integer, Set<Player>> players = this.getGameScores().entrySet().stream()
             .collect(
                 Collectors.groupingBy(
                     Map.Entry::getValue,
                     Collectors.mapping(Map.Entry::getKey, Collectors.toSet())
                 )
-                ).values()
             );
 
-        Collections.reverse(players);
-        return players;
+        return players.entrySet().stream()
+            .sorted(Map.Entry.<Integer, Set<Player>>comparingByKey().reversed())
+            .map(Map.Entry::getValue)
+            .toList();
     }
 
     private int boost(int selfPlace, int placeCount) {

src/main/java/eu/mhsl/minenet/minigames/util/CommonProperties.java

@@ -10,4 +10,11 @@ public class CommonProperties {
             this.put("east", "true");
         }
     };
+
+    public static Map<String, String> fenceNorthSouth = new HashMap<>() {
+        {
+            this.put("north", "true");
+            this.put("south", "true");
+        }
+    };
 }

src/main/java/eu/mhsl/minenet/minigames/util/Position.java

@@ -33,9 +33,15 @@ public class Position {
     public static List<Block> blocksBelowPlayer(Instance instance, Player p) {
         Point playerPos = p.getPosition();
         List<Block> blocks = new ArrayList<>();
-        GeneratorUtils.foreachXZ(playerPos.sub(0.5, 1, 0.5), playerPos.add(0.5, -1, 0.5), point -> {
-            blocks.add(instance.getBlock(point));
-        });
+        GeneratorUtils.foreachXZ(
+            playerPos.sub(0.5, 1, 0.5),
+            playerPos.add(0.5, -1, 0.5),
+            point -> blocks.add(instance.getBlock(point))
+        );
         return blocks.stream().distinct().toList();
     }
+
+    public static boolean hasPositionChanged(Pos oldPos, Pos newPos) {
+        return !oldPos.withView(0, 0).equals(newPos.withView(0, 0));
+    }
 }

src/main/resources/lang/locales.map.csv

@@ -105,7 +105,7 @@ optionPvpEnabled;pvp enabled;PvP aktiviert
 ;;
 ns:game_Stickfight#;;
 name;Stickfight;Stockschlacht
-description;Push your opponents off the Bridge;Stoße deine Gegener von der Brücke
+description;Push your opponents off the Bridge;Stoße deine Gegener von der Brücke, der Spieler mit den wenigsten Toden gewinnt!
 ;;
 ns:game_TrafficlightRace#;;
 name;Red light green light;Rotes licht, Grünes licht
@@ -170,3 +170,20 @@ ns:game_TurtleGame#;;
 name;Turtle Game;Turtle Game
 description;Eat snacks and dodge bombs to get the highest score!;Esse Snacks und weiche Bomben aus, um den höchsten Score zu erreichen!
 startSpeed;Start Speed;Startgeschwindigkeit
+;;
+ns:game_BoatRace#;;
+name;Boatrace;Bootrennen
+description;;
+;;
+ns:game_Pillars#;;
+name;Pillars;Pillars
+description;Build yourself up with your random blocks to reach your opponents and push them down!;Baue dich mit deinen zufälligen Blöcken zu deinen Gegnern und schupse sie runter!
+;;
+ns:game_BlockBattle#;;
+name;Block Battle;Block Kampf
+description;The team that fills the center with their color first wins!;Das Team, welches als erstes die Mitte mit seiner Farbe gefüllt hat, gewinnt!
+itemCount;Block Count;Block Anzahl
+;;
+ns:game_ColorJump#;;
+name;Color Jump;Farbsprung
+description;Jump on the right color!;Springe auf die richtige Farbe!