removed unnecessary logging

updated pvp library
updated to 1.21.10
2025-10-16 23:14:04 +02:00 · 2025-10-16 22:57:34 +02:00 · 2025-10-16 22:41:05 +02:00
71 changed files with 235 additions and 968 deletions
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -1,5 +1,5 @@
 <component name="ProjectCodeStyleConfiguration">
  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Minigames" />
  </state>
 </component>
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="21" />
+    <bytecodeTargetLevel target="25" />
  </component>
 </project>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_25" default="true" project-jdk-name="openjdk-25" project-jdk-type="JavaSDK" />
 </project>
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -4,7 +4,6 @@
    <modules>
      <module fileurl="file://$PROJECT_DIR$/.idea/modules/Minigames.main.iml" filepath="$PROJECT_DIR$/.idea/modules/Minigames.main.iml" />
      <module fileurl="file://$PROJECT_DIR$/.idea/modules/Minigames.test.iml" filepath="$PROJECT_DIR$/.idea/modules/Minigames.test.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/eu.mhsl.minenet.Minigames.main.iml" filepath="$PROJECT_DIR$/.idea/modules/eu.mhsl.minenet.Minigames.main.iml" />
    </modules>
  </component>
 </project>
--- a/.idea/modules/Minigames.main.iml
+++ b/.idea/modules/Minigames.main.iml
@@ -10,8 +10,4 @@
      </configuration>
    </facet>
  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
 </module>
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@

 plugins {
    id 'java'
-    id "com.github.johnrengelman.shadow" version "7.1.0"
+    id "com.github.johnrengelman.shadow" version "8.1.1"
 }

 group 'eu.mhsl.minenet'
@@ -35,7 +35,7 @@ allprojects {

 java {
    toolchain {
-        languageVersion = JavaLanguageVersion.of(21)
+        languageVersion = JavaLanguageVersion.of(25)
    }
 }

@@ -44,7 +44,7 @@ dependencies {
    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.0'

    //https://jitpack.io/#Minestom/Minestom
-    implementation 'net.minestom:minestom-snapshots:fd51c8d17a'
+    implementation 'net.minestom:minestom:2025.10.11-1.21.10'

    //Tools
    implementation 'de.articdive:jnoise:3.0.2'
@@ -57,12 +57,12 @@ dependencies {


    //PvP
-    implementation 'io.github.TogAr2:MinestomPvP:PR62-SNAPSHOT'
+    implementation 'io.github.TogAr2:MinestomPvP:56a831b41cb2ec6db8da681ad5d212ed7c71e3ee'

    // 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 {
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
--- a/src/main/java/eu/mhsl/minenet/minigames/Main.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/Main.java
@@ -3,12 +3,13 @@ package eu.mhsl.minenet.minigames;
 import eu.mhsl.minenet.minigames.api.HttpServer;
 import eu.mhsl.minenet.minigames.command.Commands;
 import eu.mhsl.minenet.minigames.handler.Listeners;
+import eu.mhsl.minenet.minigames.instance.Dimension;
 import eu.mhsl.minenet.minigames.lang.Languages;
 import eu.mhsl.minenet.minigames.server.tasks.TablistUpdateTask;
+import io.github.togar2.pvp.MinestomPvP;
+import net.minestom.server.Auth;
 import net.minestom.server.MinecraftServer;
-import net.minestom.server.extras.bungee.BungeeCordProxy;
 import net.minestom.server.extras.lan.OpenToLAN;
-import net.minestom.server.extras.velocity.VelocityProxy;
 import net.minestom.server.timer.TaskSchedule;
 import org.spongepowered.configurate.ConfigurateException;
 import org.spongepowered.configurate.ConfigurationNode;
@@ -25,7 +26,7 @@ public class Main {
    public static ConfigurationNode globalConfig;

    @SuppressWarnings("ResultOfMethodCallIgnored")
-    public static void main(String[] args) throws ConfigurateException {
+    static void main() throws ConfigurateException {
        //noinspection ResultOfMethodCallIgnored
        Resource.values(); // This initializes and preloads the enum and extracts the resources
        Languages.getInstance(); //Preload languages into the jvm
@@ -40,29 +41,35 @@ public class Main {

        logger.info("Initialize Minecraft server...");

-        MinecraftServer server = MinecraftServer.init();
-//        MinestomPvP.init();
+        MinecraftServer server = null;
+        if(serverConfig.node("open-to-lan").getBoolean()) OpenToLAN.open();
+
+        if(globalConfig.node("bungeecord", "enabled").getBoolean()) {
+            server = MinecraftServer.init(new Auth.Bungee());
+        }
+
+        if(globalConfig.node("velocity", "enabled").getBoolean()) {
+            server = MinecraftServer.init(new Auth.Velocity(Objects.requireNonNull(globalConfig.node("velocity", "secret").getString())));
+        }
+
+        if(server == null) server = MinecraftServer.init();
+
+        MinestomPvP.init();

        MinecraftServer.setBrandName("mhsl.eu - minenet - credits to minestom");
        MinecraftServer.setCompressionThreshold(serverConfig.node("compression-threshold").getInt(0));
        System.setProperty("minestom.chunk-view-distance", String.valueOf(serverConfig.node("view-distance").getInt()));
+        System.setProperty("minestom.registry.unsafe-ops", "true");

        Commands.values();
        Listeners.values();
+        Dimension.values();
        new HttpServer();

        MinecraftServer.getSchedulerManager().scheduleTask(new TablistUpdateTask(), TaskSchedule.tick(20), TaskSchedule.tick(20));

        logger.info("Starting Minecraft server ... ");

-        if(serverConfig.node("open-to-lan").getBoolean()) OpenToLAN.open();
-
-        if(globalConfig.node("bungeecord", "enabled").getBoolean()) BungeeCordProxy.enable();
-
-        if(globalConfig.node("velocity", "enabled").getBoolean()) {
-            VelocityProxy.enable(Objects.requireNonNull(globalConfig.node("velocity", "secret").getString()));
-        }
-
        server.start("0.0.0.0", serverConfig.node("port").getInt(25565));
        System.gc();

--- a/src/main/java/eu/mhsl/minenet/minigames/command/privileged/PublishRewardCommand.java
+++ b/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.9.3:8080/api/event/reward"))
+                    .uri(new URI("http://10.20.7.1:8080/api/event/reward"))
                    .POST(HttpRequest.BodyPublishers.ofString(rewardRequestJson))
                    .build();

--- a/src/main/java/eu/mhsl/minenet/minigames/command/privileged/SetMemorialCommand.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/command/privileged/SetMemorialCommand.java
@@ -21,7 +21,7 @@ public class SetMemorialCommand extends PrivilegedCommand {
        ArgumentString loreArgument = ArgumentType.String("lore");

        materialArgument.setSuggestionCallback(
-            (sender, context, suggestion) -> Material
+            (_, _, suggestion) -> Material
                .values()
                .stream()
                .map(material -> new SuggestionEntry(material.name(), Component.text(material.name())))
@@ -35,7 +35,7 @@ public class SetMemorialCommand extends PrivilegedCommand {
                .getTournament()
                .setMemorialConfiguration(
                    new MemorialConfiguration(
-                        Material.fromNamespaceId(context.get(materialArgument)),
+                        Material.fromKey(context.get(materialArgument)),
                        context.get(titleArgument),
                        context.get(loreArgument)
                    )
--- a/src/main/java/eu/mhsl/minenet/minigames/command/privileged/SetRewardCommand.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/command/privileged/SetRewardCommand.java
@@ -23,7 +23,7 @@ public class SetRewardCommand extends PrivilegedCommand {
        ArgumentStringArray amountsArgument = ArgumentType.StringArray("amount");

        materialArgument.setSuggestionCallback(
-            (sender, context, suggestion) -> Material
+            (_, _, suggestion) -> Material
                .values()
                .stream()
                .map(material -> new SuggestionEntry(material.name(), Component.text(material.name())))
@@ -37,7 +37,7 @@ public class SetRewardCommand extends PrivilegedCommand {
                .getTournament()
                .setRewardConfiguration(
                    new RewardConfiguration(
-                        Material.fromNamespaceId(context.get(materialArgument)),
+                        Material.fromKey(context.get(materialArgument)),
                        Arrays.stream(context.get(amountsArgument)).map(Integer::valueOf).collect(Collectors.toList())
                    )
                );
--- a/src/main/java/eu/mhsl/minenet/minigames/command/privileged/SetRoomOwnerCommand.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/command/privileged/SetRoomOwnerCommand.java
@@ -25,7 +25,6 @@ public class SetRoomOwnerCommand extends PrivilegedCommand {
        });

        this.addSyntax((sender, context) -> {
-            System.out.println("Test");
            if(sender instanceof Player p) {
                Player newOwner = MinecraftServer.getConnectionManager().getOnlinePlayerByUsername(context.getRaw("player"));
                Room.getRoom(p).orElseThrow().setOwner(Objects.requireNonNull(newOwner));
--- a/src/main/java/eu/mhsl/minenet/minigames/handler/global/ChatFormatHandler.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/handler/global/ChatFormatHandler.java
@@ -2,8 +2,6 @@ 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;
@@ -16,14 +14,7 @@ public class ChatFormatHandler implements EventListener<PlayerChatEvent> {

    @Override
    public @NotNull Result run(@NotNull PlayerChatEvent event) {
-        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())
-        );
+        event.setFormattedMessage(new ChatMessage(Icon.CHAT).appendStatic(event.getRawMessage()).build(event.getPlayer()));
        return Result.SUCCESS;
    }
 }
--- a/src/main/java/eu/mhsl/minenet/minigames/instance/Dimension.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/instance/Dimension.java
@@ -1,49 +1,50 @@
 package eu.mhsl.minenet.minigames.instance;

+import net.kyori.adventure.key.Key;
 import net.minestom.server.MinecraftServer;
-import net.minestom.server.registry.DynamicRegistry;
-import net.minestom.server.utils.NamespaceID;
+import net.minestom.server.registry.RegistryKey;
 import net.minestom.server.world.DimensionType;
+import org.jetbrains.annotations.NotNull;

 /**
 * Prebuilt dimensions
 */
 public enum Dimension {
    OVERWORLD(
-        NamespaceID.from("minenet:fullbright_overworld"),
+        Key.key("minenet:fullbright_overworld"),
        DimensionType
            .builder()
-            .ambientLight(2.0f)
+            .ambientLight(1.0f)
            .build()
    ),

    NETHER(
-        NamespaceID.from("minenet:fullbright_nether"),
+        Key.key("minenet:fullbright_nether"),
        DimensionType
            .builder()
-            .ambientLight(2.0f)
+            .ambientLight(1.0f)
            .effects("minecraft:the_nether")
            .build()
    ),

    THE_END(
-        NamespaceID.from("minenet:fullbright_end"),
+        Key.key("minenet:fullbright_end"),
        DimensionType
            .builder()
-            .ambientLight(2.0f)
+            .ambientLight(1.0f)
            .effects("minecraft:the_end")
            .build()
    );

    public final DimensionType DIMENSION;
-    public final NamespaceID namespaceID;
-    public final DynamicRegistry.Key<DimensionType> key;
+    public final Key namespaceID;
+    public final RegistryKey<@NotNull DimensionType> key;

-    Dimension(NamespaceID namespaceID, DimensionType dimType) {
+    Dimension(Key namespaceID, DimensionType dimType) {
        this.DIMENSION = dimType;
        this.namespaceID = namespaceID;

-        this.key = MinecraftServer.getDimensionTypeRegistry().register(namespaceID, this.DIMENSION);
+        this.key = MinecraftServer.getDimensionTypeRegistry().register(this.namespaceID, this.DIMENSION);
    }

 }
--- a/src/main/java/eu/mhsl/minenet/minigames/instance/MineNetInstance.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/instance/MineNetInstance.java
@@ -7,14 +7,15 @@ import net.minestom.server.event.instance.AddEntityToInstanceEvent;
 import net.minestom.server.event.instance.RemoveEntityFromInstanceEvent;
 import net.minestom.server.instance.Instance;
 import net.minestom.server.instance.InstanceContainer;
-import net.minestom.server.registry.DynamicRegistry;
+import net.minestom.server.registry.RegistryKey;
 import net.minestom.server.timer.TaskSchedule;
 import net.minestom.server.world.DimensionType;
+import org.jetbrains.annotations.NotNull;

 import java.util.UUID;

 public class MineNetInstance extends InstanceContainer {
-    public MineNetInstance(DynamicRegistry.Key<DimensionType> type) {
+    public MineNetInstance(RegistryKey<@NotNull DimensionType> type) {
        super(UUID.randomUUID(), type);
        MinecraftServer.getInstanceManager().registerInstance(this);

--- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/Game.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/Game.java
@@ -16,7 +16,7 @@ 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.registry.DynamicRegistry;
+import net.minestom.server.registry.RegistryKey;
 import net.minestom.server.timer.ExecutionType;
 import net.minestom.server.timer.TaskSchedule;
 import net.minestom.server.world.DimensionType;
@@ -34,7 +34,7 @@ public abstract class Game extends MineNetInstance implements Spawnable {
    protected boolean isRunning = false;
    protected boolean isBeforeBeginning = true;

-    public Game(DynamicRegistry.Key<DimensionType> dimensionType) {
+    public Game(RegistryKey<@NotNull DimensionType> dimensionType) {
        super(dimensionType);

        MinecraftServer.getInstanceManager().registerInstance(this);
--- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/GameList.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/GameList.java
@@ -5,9 +5,7 @@ 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.deathcube.DeathcubeFactory;
 import eu.mhsl.minenet.minigames.instance.game.stateless.types.elytraRace.ElytraRaceFactory;
@@ -15,7 +13,6 @@ import eu.mhsl.minenet.minigames.instance.game.stateless.types.fastbridge.Fastbr
 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;
@@ -47,10 +44,7 @@ public enum GameList {
    HIGHGROUND(new HighGroundFactory(), GameType.PVP),
    FASTBRIDGE(new FastbridgeFactory(), GameType.OTHER),
    BLOCKBREAKRACE(new BlockBreakRaceFactory(), GameType.OTHER),
-    SPACESNAKE(new SpaceSnakeFactory(), GameType.PVP),
-    BOATRACE(new BoatRaceFactory(), GameType.OTHER),
-    PILLARS(new PillarsFactory(), GameType.PROTOTYPE),
-    BLOCKBATTLE(new BlockBattleFactory(), GameType.PROTOTYPE);
+    SPACESNAKE(new SpaceSnakeFactory(), GameType.PVP);

    private final GameFactory factory;
    private final GameType type;
--- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/StatelessGame.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/StatelessGame.java
@@ -9,11 +9,12 @@ import eu.mhsl.minenet.minigames.score.Score;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
-import net.minestom.server.registry.DynamicRegistry;
+import net.minestom.server.registry.RegistryKey;
 import net.minestom.server.timer.ExecutionType;
 import net.minestom.server.timer.Task;
 import net.minestom.server.timer.TaskSchedule;
 import net.minestom.server.world.DimensionType;
+import org.jetbrains.annotations.NotNull;

 import java.time.Duration;
 import java.util.concurrent.CompletableFuture;
@@ -26,7 +27,7 @@ public class StatelessGame extends Game {
    private int timeLimit = 0;
    private int timePlayed = 0;

-    public StatelessGame(DynamicRegistry.Key<DimensionType> dimensionType, String gameName, Score score) {
+    public StatelessGame(RegistryKey<@NotNull DimensionType> dimensionType, String gameName, Score score) {
        super(dimensionType);
        this.score = score;
        this.name = gameName;
--- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/config/GameConfigurationInventory.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/config/GameConfigurationInventory.java
@@ -15,8 +15,7 @@ import net.minestom.server.entity.Player;
 import net.minestom.server.event.instance.AddEntityToInstanceEvent;
 import net.minestom.server.event.instance.RemoveEntityFromInstanceEvent;
 import net.minestom.server.inventory.InventoryType;
-import net.minestom.server.inventory.click.ClickType;
-import net.minestom.server.inventory.condition.InventoryConditionResult;
+import net.minestom.server.inventory.click.Click;
 import net.minestom.server.item.ItemStack;
 import net.minestom.server.item.Material;
 import net.minestom.server.sound.SoundEvent;
@@ -39,8 +38,8 @@ public class GameConfigurationInventory extends InteractableInventory {
        this.factory = factory;

        room.eventNode()
-            .addListener(AddEntityToInstanceEvent.class, addEntityToInstanceEvent -> MinecraftServer.getSchedulerManager().scheduleNextTick(this::updatePlayButton))
-            .addListener(RemoveEntityFromInstanceEvent.class, removeEntityFromInstanceEvent -> MinecraftServer.getSchedulerManager().scheduleNextTick(this::updatePlayButton));
+            .addListener(AddEntityToInstanceEvent.class, _ -> MinecraftServer.getSchedulerManager().scheduleNextTick(this::updatePlayButton))
+            .addListener(RemoveEntityFromInstanceEvent.class, _ -> MinecraftServer.getSchedulerManager().scheduleNextTick(this::updatePlayButton));

        ConfigManager config = factory.configuration();

@@ -53,7 +52,7 @@ public class GameConfigurationInventory extends InteractableInventory {
                )
                .build(),
            0,
-            itemClick -> itemClick.getPlayer().closeInventory(),
+            itemClick -> itemClick.player().closeInventory(),
            true
        );

@@ -106,8 +105,7 @@ public class GameConfigurationInventory extends InteractableInventory {
    }

    @Override
-    protected void onClick(Player player, int slot, ClickType clickType, InventoryConditionResult inventoryConditionResult) {
-        inventoryConditionResult.setCancel(true);
+    protected void onClick(Player player, int slot, Click clickType) {

        if(!this.map.containsKey(slot)) return;

@@ -133,7 +131,7 @@ public class GameConfigurationInventory extends InteractableInventory {
                    .lore(restrictionHandler.getWarnings(restrictionData).stream().map(translatedComponent -> translatedComponent.getAssembled(this.p)).collect(Collectors.toList()))
                    .build(),
                8,
-                itemClick -> Game.initialize(this.factory, this.map.values().stream().toList(), itemClick.getPlayer()),
+                itemClick -> Game.initialize(this.factory, this.map.values().stream().toList(), itemClick.player()),
                true
            );

@@ -155,7 +153,7 @@ public class GameConfigurationInventory extends InteractableInventory {
                        this.updatePlayButton();
                        return;
                    }
-                    itemClick.getPlayer().playSound(Sound.sound(SoundEvent.ENTITY_SILVERFISH_DEATH, Sound.Source.AMBIENT, 1f, 1f));
+                    itemClick.player().playSound(Sound.sound(SoundEvent.ENTITY_SILVERFISH_DEATH, Sound.Source.AMBIENT, 1f, 1f));
                },
                false
            );
--- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/blockBattle/BlockBattle.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/blockBattle/BlockBattle.java
@@ -1,207 +0,0 @@
-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);
-    }
-}
--- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/blockBattle/BlockBattleFactory.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/blockBattle/BlockBattleFactory.java
@@ -1,40 +0,0 @@
-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);
-    }
-}
--- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/blockBattle/Team.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/blockBattle/Team.java
@@ -1,21 +0,0 @@
-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;
-        }
-    }
-}
--- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/boatRace/BoatRace.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/boatRace/BoatRace.java
@@ -1,75 +0,0 @@
-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);
-    }
-}
--- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/boatRace/BoatRaceFactory.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/boatRace/BoatRaceFactory.java
@@ -1,27 +0,0 @@
-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);
-    }
-}
--- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/deathcube/Deathcube.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/deathcube/Deathcube.java
@@ -35,7 +35,6 @@ class Deathcube extends StatelessGame {
                .add(CombatFeatures.VANILLA_KNOCKBACK)
                .build().createNode()
        );
-        System.out.println(radius);
    }

    @Override
--- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/elytraRace/ElytraRace.java
+++ b/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(0, this.ringSpacing));
+        this.playerCheckpoints.putIfAbsent(player, new CheckPointData(this.ringSpacing, this.ringSpacing * 2));

        if(newPos.z() > this.generatedUntil - this.ringSpacing) {
            this.generateRing(this.generatedUntil + this.ringSpacing);
@@ -224,9 +224,7 @@ 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));
--- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/highGround/HighGround.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/highGround/HighGround.java
@@ -8,6 +8,7 @@ import io.github.togar2.pvp.events.EntityKnockbackEvent;
 import io.github.togar2.pvp.events.FinalAttackEvent;
 import io.github.togar2.pvp.events.PrepareAttackEvent;
 import io.github.togar2.pvp.feature.CombatFeatures;
+import io.github.togar2.pvp.feature.knockback.KnockbackSettings;
 import net.minestom.server.coordinate.Pos;
 import net.minestom.server.entity.Player;
 import net.minestom.server.event.instance.InstanceTickEvent;
@@ -50,7 +51,7 @@ class HighGround extends StatelessGame {

        this.eventNode().addListener(
            EntityKnockbackEvent.class,
-            entityKnockbackEvent -> entityKnockbackEvent.setStrength(1.1f)
+            entityKnockbackEvent -> entityKnockbackEvent.setSettings(new KnockbackSettings(1.1, 1.1, 2, 0, 0))
        );

        this.eventNode().addListener(InstanceTickEvent.class, instanceTickEvent -> {
--- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/pillars/Pillars.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/pillars/Pillars.java
@@ -1,103 +0,0 @@
-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);
-        });
-    }
-}
--- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/pillars/PillarsFactory.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/pillars/PillarsFactory.java
@@ -1,32 +0,0 @@
-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);
-    }
-}
--- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/spaceSnake/SpaceSnake.java
+++ b/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();
--- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/stickfight/StickFightFactory.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/stickfight/StickFightFactory.java
@@ -28,8 +28,7 @@ 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("seconds", Material.CLOCK, TranslatedComponent.byId("optionCommon#seconds"), 30, 60, 90, 120));
+            .addOption(new NumericOption("length", Material.SANDSTONE, TranslatedComponent.byId("optionCommon#length"), 7, 10, 13, 16, 19));
    }

    @Override
@@ -41,7 +40,7 @@ public class StickFightFactory implements GameFactory {

    @Override
    public Game manufacture(Room parent, Map<String, Option<?>> configuration) {
-        return new Stickfight(configuration.get("length").getAsInt(), configuration.get("seconds").getAsInt()).setParent(parent);
+        return new Stickfight(configuration.get("length").getAsInt()).setParent(parent);
    }

    @Override
--- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/stickfight/Stickfight.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/stickfight/Stickfight.java
@@ -10,8 +10,6 @@ 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;
@@ -24,12 +22,10 @@ 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, int seconds) {
+    public Stickfight(int length) {
        super(Dimension.OVERWORLD.key, "Stickfight", new LowestPointsWinScore());
        this.radius = length;
-        this.seconds = seconds;

        this.eventNode().addChild(
            CombatFeatures.empty()
@@ -83,18 +79,10 @@ 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));
@@ -129,7 +117,6 @@ 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));
        }
    }

--- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/tetris/Tetris.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/tetris/Tetris.java
@@ -6,20 +6,16 @@ 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;
@@ -75,36 +71,48 @@ 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);
    }

-    private void onPlayerInteract(@NotNull PlayerUseItemEvent event) {
-        event.setItemUseTime(0);
-        this.tetrisGames.get(event.getPlayer()).pressedButtonRaw(TetrisGame.Button.mouseRight);
+    @Override
+    protected void onPlayerMove(@NotNull PlayerMoveEvent event) {
+        Player player = event.getPlayer();
+        Pos currentPosition = event.getNewPosition();
+
+        TetrisGame tetrisGame = this.tetrisGames.get(player);
+
+        if(tetrisGame == null) {
+            event.setCancelled(true);
+            return;
+        }
+        if(tetrisGame.lost) return;
+        if(player.getGameMode() == GameMode.SPECTATOR) return;
+
+        if(player.inputs().forward()) tetrisGame.pressedButton(TetrisGame.Button.W);
+        if(player.inputs().backward()) tetrisGame.pressedButton(TetrisGame.Button.S);
+        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);
    }

-    private void onPlayerAttack(@NotNull PlayerHandAnimationEvent event) {
-        this.tetrisGames.get(event.getPlayer()).pressedButtonRaw(TetrisGame.Button.mouseLeft);
+    protected void onPlayerInteract(@NotNull PlayerUseItemEvent event) {
+        this.tetrisGames.get(event.getPlayer()).pressedButton(TetrisGame.Button.mouseRight);
    }

-    private void onPlayerTick(PlayerTickEvent event) {
+    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) {
+        if(tetrisGame.lost && player.getGameMode() != GameMode.SPECTATOR) {
            this.letPlayerLoose(player);
-            return;
        }
-
-        if(player.getGameMode() == GameMode.SPECTATOR) return;
-
-        if(player.inputs().forward()) tetrisGame.pressedButtonRaw(TetrisGame.Button.W);
-        if(player.inputs().backward()) tetrisGame.pressedButtonRaw(TetrisGame.Button.S);
-        if(player.inputs().right()) tetrisGame.pressedButtonRaw(TetrisGame.Button.D);
-        if(player.inputs().left()) tetrisGame.pressedButtonRaw(TetrisGame.Button.A);
-        if(player.inputs().jump()) tetrisGame.pressedButtonRaw(TetrisGame.Button.space);
    }

    private void letPlayerLoose(Player player) {
@@ -112,7 +120,6 @@ 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());
        }

@@ -150,16 +157,6 @@ 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);
    }

--- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/tetris/game/Orientation.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/tetris/game/Orientation.java
@@ -1,28 +0,0 @@
-package eu.mhsl.minenet.minigames.instance.game.stateless.types.tetris.game;
-
-public enum Orientation {
-    NONE,
-    RIGHT,
-    LEFT,
-    UPSIDE_DOWN;
-
-    public Orientation rotated(boolean clockwise) {
-        switch(this) {
-            case NONE -> {
-                return clockwise ? Orientation.RIGHT : Orientation.LEFT;
-            }
-            case RIGHT -> {
-                return clockwise ? Orientation.UPSIDE_DOWN : Orientation.NONE;
-            }
-            case UPSIDE_DOWN -> {
-                return clockwise ? Orientation.LEFT : Orientation.RIGHT;
-            }
-            case LEFT -> {
-                return clockwise ? Orientation.NONE : Orientation.UPSIDE_DOWN;
-            }
-            default -> {
-                return Orientation.NONE;
-            }
-        }
-    }
-}
--- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/tetris/game/RotationChecker.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/tetris/game/RotationChecker.java
@@ -1,52 +0,0 @@
-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);
-        };
-    }
-}
--- 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
@@ -2,9 +2,10 @@ 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.Task;
+import net.minestom.server.timer.Scheduler;
 import net.minestom.server.timer.TaskSchedule;

 import java.util.*;
@@ -22,8 +23,6 @@ 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 Task hardTetrominoLockTask;
    public boolean lost = false;
    public boolean paused = true;
    public Tetromino currentTetromino;
@@ -54,28 +53,25 @@ public class TetrisGame {
        }
    }

-    public void pressedButtonRaw(Button button) {
-        final int standardButtonDelay = 95;
-        final int wsButtonDebounce = 70;
+    public void pressedButton(Button button) {
+        final int standardButtonDelay = 100;
+        final int buttonDebounce = 70;

        if(this.lastPresses.getOrDefault(button, 0L) >= System.currentTimeMillis() - standardButtonDelay) return;

-        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());
-        }
+        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);

        if(this.lost || this.paused) return;

        switch(button) {
-            case A -> this.moveLeft();
+            case A -> this.currentTetromino.moveLeft();
            case S -> this.moveDown();
-            case D -> this.moveRight();
+            case D -> this.currentTetromino.moveRight();
            case W -> this.hardDrop();
-            case mouseLeft -> this.rotate(false);
-            case mouseRight -> this.rotate(true);
+            case mouseLeft -> this.currentTetromino.rotate(false);
+            case mouseRight -> this.currentTetromino.rotate(true);
            case space -> this.switchHold();
        }
    }
@@ -86,7 +82,8 @@ public class TetrisGame {

    public void start() {
        this.paused = false;
-        this.instance.scheduler().submitTask(() -> {
+        Scheduler scheduler = MinecraftServer.getSchedulerManager();
+        scheduler.submitTask(() -> {
            if(this.lost) return TaskSchedule.stop();
            int standardTickDelay = 40;
            if(this.isFast) standardTickDelay = 20;
@@ -114,9 +111,8 @@ public class TetrisGame {

    public void tick() {
        if(this.lost || this.paused) return;
-        if(!this.currentTetromino.isGrounded()) this.stopTetrominoLockTask(true);
        if(!this.currentTetromino.moveDown()) {
-            this.scheduleTetrominoLock();
+            this.setActiveTetrominoDown();
        }
    }

@@ -143,42 +139,33 @@ public class TetrisGame {
        this.lost = true;
    }

-    private void moveDown() {
+    private boolean moveDown() {
        if(!this.currentTetromino.moveDown()) {
-            this.scheduleTetrominoLock();
-            return;
+            this.setActiveTetrominoDown();
+            return false;
        }
        this.score += 1;
        this.updateInfo();
+        return true;
    }

-    private void moveLeft() {
-        if(this.currentTetromino.moveLeft()) this.stopTetrominoLockTask(false);
-    }
-
-    private void moveRight() {
-        if(this.currentTetromino.moveRight()) this.stopTetrominoLockTask(false);
-    }
-
-    private void rotate(boolean clockwise) {
-        if(this.currentTetromino.rotate(clockwise)) this.stopTetrominoLockTask(false);
-    }
-
-    private void hardDrop() {
+    private boolean hardDrop() {
        if(!this.currentTetromino.moveDown()) {
-            this.lockActiveTetromino();
-            return;
+            this.setActiveTetrominoDown();
+            return false;
        }
-        do {
        this.score += 2;
-        } while(this.currentTetromino.moveDown());
        this.updateInfo();
-        this.lockActiveTetromino();
+        while(this.currentTetromino.moveDown()) {
+            this.score += 2;
+            this.updateInfo();
+        }
+        this.setActiveTetrominoDown();
+        return true;
    }

-    private void switchHold() {
-        if(!this.holdPossible) return;
-        this.stopTetrominoLockTask(true);
+    private boolean switchHold() {
+        if(!this.holdPossible) return false;

        Tetromino newCurrentTetromino;
        if(this.holdTetromino == null) {
@@ -202,6 +189,7 @@ public class TetrisGame {
        this.holdTetromino.setPosition(this.holdPosition.add(xChange, 0, 0));
        this.holdTetromino.drawAsEntities();
        this.holdPossible = false;
+        return true;
    }

    private void updateNextTetrominoes() {
@@ -247,40 +235,7 @@ public class TetrisGame {
        this.sidebar.updateLineScore("2", this.level);
    }

-    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(true);
-                }
-                return TaskSchedule.stop();
-            }, TaskSchedule.millis(500));
-        if(this.hardTetrominoLockTask == null || !this.hardTetrominoLockTask.isAlive())
-            this.hardTetrominoLockTask = this.instance.scheduler().scheduleTask(() -> {
-                if(this.currentTetromino.isGrounded()) {
-                    this.lockActiveTetromino();
-                } else {
-                    this.stopTetrominoLockTask(true);
-                }
-                return TaskSchedule.stop();
-            }, TaskSchedule.millis(6000));
-    }
-
-    private void stopTetrominoLockTask(boolean resetHard) {
-        if(this.tetrominoLockTask != null) {
-            this.tetrominoLockTask.cancel();
-            this.tetrominoLockTask = null;
-        }
-        if(resetHard && this.hardTetrominoLockTask != null) {
-            this.hardTetrominoLockTask.cancel();
-            this.hardTetrominoLockTask = null;
-        }
-    }
-
-    private void lockActiveTetromino() {
-        this.stopTetrominoLockTask(true);
+    private void setActiveTetrominoDown() {
        this.currentTetromino.removeOwnEntities();
        this.currentTetromino = this.nextTetrominoes.removeFirst();
        this.currentTetromino.remove();
--- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/tetris/game/Tetromino.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/tetris/game/Tetromino.java
@@ -8,12 +8,14 @@ import net.minestom.server.entity.metadata.other.FallingBlockMeta;
 import net.minestom.server.instance.block.Block;
 import net.minestom.server.tag.Tag;

-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.UUID;

 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;
@@ -26,10 +28,10 @@ public class Tetromino {
        this.uuid = UUID.randomUUID();

        switch(this.shape) {
-            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 I -> this.shapeArray = new int[][]{{0, 0, 0, 0}, {1, 1, 1, 1}, {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[][]{{0, 1, 1}, {0, 1, 1}, {0, 0, 0}};
+            case O -> this.shapeArray = new int[][]{{1, 1}, {1, 1}};
            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}};
@@ -41,23 +43,12 @@ public class Tetromino {
    }

    public void setPosition(Pos newPosition) {
-        this.position = new Pos(newPosition.x(), newPosition.y(), newPosition.z());
+        this.position = newPosition;
    }

    public boolean rotate(boolean clockwise) {
        int[][] newShapeArray = this.getTurnedShapeArray(clockwise);
-        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;
+        return this.checkCollisionAndMove(this.position, newShapeArray);
    }

    public boolean moveDown() {
@@ -82,7 +73,7 @@ public class Tetromino {
    public void draw(boolean withGhost) {
        if(withGhost) {
            Pos ghostPos = this.position;
-            while(!this.hasCollision(ghostPos.sub(0, 1, 0), this.shapeArray)) {
+            while(!this.checkCollision(ghostPos.sub(0, 1, 0), this.shapeArray)) {
                ghostPos = ghostPos.sub(0, 1, 0);
            }
            Pos positionChange = this.position.sub(ghostPos);
@@ -191,7 +182,7 @@ public class Tetromino {

    private boolean isPartOfTetromino(Pos position) {
        return this.getBlockPositions().stream()
-            .anyMatch(pos -> pos.sameBlock(position));
+            .anyMatch(pos -> pos.equals(position));
    }

    private List<Pos> getBlockPositions() {
@@ -207,10 +198,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) {
-                    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));
+                    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));
                    }
                }
            }
@@ -219,7 +210,7 @@ public class Tetromino {
        return returnList;
    }

-    private boolean hasCollision(Pos newPosition, int[][] newShapeArray) {
+    private boolean checkCollision(Pos newPosition, int[][] newShapeArray) {
        List<Pos> newBlockPositions = this.getBlockPositions(newPosition, newShapeArray);

        for(Pos pos : newBlockPositions) {
@@ -231,18 +222,16 @@ 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.hasCollision(newPosition, newShapeArray)) return false;
+        if(!this.checkCollision(newPosition, newShapeArray)) {
            this.remove();
            this.shapeArray = Arrays.stream(newShapeArray).map(int[]::clone).toArray(int[][]::new);
            this.setPosition(newPosition);
            this.draw();
            return true;
        }
+        return false;
+    }

    public enum Shape {
        I,
--- a/src/main/java/eu/mhsl/minenet/minigames/instance/hub/inventory/HubInventory.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/instance/hub/inventory/HubInventory.java
@@ -19,7 +19,7 @@ public class HubInventory extends InteractableInventory {
                .lore(TranslatedComponent.assemble("hub#create_description", p))
                .build(),
            12,
-            itemClick -> Room.createRoom(itemClick.getPlayer()),
+            itemClick -> Room.createRoom(itemClick.player()),
            true
        );

@@ -30,7 +30,7 @@ public class HubInventory extends InteractableInventory {
                .lore(TranslatedComponent.assemble("hub#join_description", p))
                .build(),
            14,
-            itemClick -> itemClick.getPlayer().openInventory(new JoinInventory(itemClick.getPlayer()))
+            itemClick -> itemClick.player().openInventory(new JoinInventory(itemClick.player()))
        );
    }
 }
--- a/src/main/java/eu/mhsl/minenet/minigames/instance/hub/inventory/JoinInventory.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/instance/hub/inventory/JoinInventory.java
@@ -11,8 +11,7 @@ import net.minestom.server.MinecraftServer;
 import net.minestom.server.entity.Player;
 import net.minestom.server.event.player.PlayerPacketEvent;
 import net.minestom.server.inventory.InventoryType;
-import net.minestom.server.inventory.click.ClickType;
-import net.minestom.server.inventory.condition.InventoryConditionResult;
+import net.minestom.server.inventory.click.Click;
 import net.minestom.server.item.ItemStack;
 import net.minestom.server.item.Material;
 import net.minestom.server.network.packet.client.play.ClientNameItemPacket;
@@ -32,7 +31,7 @@ public class JoinInventory extends InteractableInventory {
                .customName(Component.text(this.prefix))
                .build(),
            0,
-            itemClick -> {
+            _ -> {
            }
        );

@@ -45,9 +44,8 @@ public class JoinInventory extends InteractableInventory {
    }

    @Override
-    protected void onClick(Player player, int slot, ClickType clickType, InventoryConditionResult inventoryConditionResult) {
+    protected void onClick(Player player, int slot, Click clickType) {
        if(slot != 2) return;
-        inventoryConditionResult.setCancel(true);
        player.closeInventory();

        this.typedText = this.formatInput(this.typedText);
--- a/src/main/java/eu/mhsl/minenet/minigames/instance/room/inventory/MinigameSelectInventory.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/instance/room/inventory/MinigameSelectInventory.java
@@ -33,7 +33,7 @@ public class MinigameSelectInventory extends InteractableInventory {
                    .lore(type.getDescription().addWrap().getWrappedAssembled(p))
                    .build(),
                itemAlignment.next().get(),
-                itemClick -> this.drawGames(type)
+                _ -> this.drawGames(type)
            );
        }

@@ -62,7 +62,8 @@ public class MinigameSelectInventory extends InteractableInventory {
                    .lore(gameFactory.description().addWrap().getWrappedAssembled(this.p))
                    .build(),
                offset + itemAlignment.next().get(),
-                itemClick -> itemClick.getPlayer().openInventory(new GameConfigurationInventory(this.room, itemClick.getPlayer(), gameFactory))
+                itemClick -> itemClick.player().openInventory(new GameConfigurationInventory(this.room, itemClick.player(), gameFactory)),
+                true
            );
        }
    }
--- a/src/main/java/eu/mhsl/minenet/minigames/score/Score.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/score/Score.java
@@ -30,11 +30,6 @@ 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)));
    }
--- a/src/main/java/eu/mhsl/minenet/minigames/score/tournament/Tournament.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/score/tournament/Tournament.java
@@ -24,8 +24,8 @@ public class Tournament {
                for(Player player : players) {
                    int points = (game.getScores().size() - count) + this.boost(count, game.getScores().size());

-                    data.computeIfPresent(player, (existingPlayer, existingPoints) -> existingPoints + points);
-                    data.computeIfAbsent(player, newPlayer -> points);
+                    data.computeIfPresent(player, (_, existingPoints) -> existingPoints + points);
+                    data.computeIfAbsent(player, _ -> points);
                }
            }
        });
@@ -44,28 +44,28 @@ public class Tournament {
        }

        return new Rewards(
-            this.memorialConfiguration.memorialMaterial().namespace().value(),
+            this.memorialConfiguration.memorialMaterial().key().value(),
            this.memorialConfiguration.memorialTitle(),
            this.memorialConfiguration.memorialLore(),
            this.getGameScores().keySet().stream().map(Player::getUuid).toList(),
-            this.rewardConfiguration.item().namespace().value(),
+            this.rewardConfiguration.item().key().value(),
            itemCount
        );
    }

    public List<Set<Player>> getPlaces() {
-        Map<Integer, Set<Player>> players = this.getGameScores().entrySet().stream()
+        List<Set<Player>> players = new ArrayList<>(
+            this.getGameScores().entrySet().stream()
                .collect(
                    Collectors.groupingBy(
                        Map.Entry::getValue,
                        Collectors.mapping(Map.Entry::getKey, Collectors.toSet())
                    )
+                ).values()
        );

-        return players.entrySet().stream()
-            .sorted(Map.Entry.<Integer, Set<Player>>comparingByKey().reversed())
-            .map(Map.Entry::getValue)
-            .toList();
+        Collections.reverse(players);
+        return players;
    }

    private int boost(int selfPlace, int placeCount) {
--- a/src/main/java/eu/mhsl/minenet/minigames/shared/inventory/InteractableInventory.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/shared/inventory/InteractableInventory.java
@@ -2,38 +2,64 @@ package eu.mhsl.minenet.minigames.shared.inventory;

 import net.kyori.adventure.text.Component;
 import net.minestom.server.entity.Player;
+import net.minestom.server.event.inventory.InventoryPreClickEvent;
 import net.minestom.server.inventory.Inventory;
 import net.minestom.server.inventory.InventoryType;
-import net.minestom.server.inventory.click.ClickType;
-import net.minestom.server.inventory.condition.InventoryConditionResult;
+import net.minestom.server.inventory.click.Click;
 import net.minestom.server.item.ItemStack;
 import net.minestom.server.item.Material;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;

+import java.util.HashMap;
+import java.util.Map;
 import java.util.function.Consumer;

 public class InteractableInventory extends Inventory {
+    private final Map<Integer, ClickableItem> clickableItems = new HashMap<>();
+
+    public record ItemClick(Player player, InteractableInventory inventory, int clickedSlot, ItemStack item, Click clickType) { }
+    public record ClickableItem(ItemStack item, int slot, Consumer<ItemClick> callback, boolean closeAfterClick) { }
+
    /**
     * Defines an Inventory with direct callbacks for ItemSlots
     */
    protected InteractableInventory(@NotNull InventoryType inventoryType, @NotNull Component title) {
        super(inventoryType, title);

-        this.addInventoryCondition(this::onClick);
+        this.eventNode().addListener(
+            InventoryPreClickEvent.class,
+            inventoryPreClickEvent -> this.onClick(
+                inventoryPreClickEvent.getPlayer(),
+                inventoryPreClickEvent.getSlot(),
+                inventoryPreClickEvent.getClick()
+            )
+        );
+
+        this.eventNode().addListener(InventoryPreClickEvent.class, inventoryPreClickEvent -> {
+            @Nullable ClickableItem selectedItem = this.clickableItems.values().stream()
+                .filter(clickableItem -> clickableItem.slot() == inventoryPreClickEvent.getSlot())
+                .findFirst()
+                .orElse(null);
+            if(selectedItem == null) {
+                inventoryPreClickEvent.setCancelled(true);
+                return;
+            }
+            if(selectedItem.closeAfterClick()) inventoryPreClickEvent.getPlayer().closeInventory();
+            selectedItem.callback().accept(
+                new ItemClick(inventoryPreClickEvent.getPlayer(), this, inventoryPreClickEvent.getSlot(), selectedItem.item(), inventoryPreClickEvent.getClick())
+            );
+            inventoryPreClickEvent.setCancelled(true);
+        });
    }

    /**
     * Set Item with Callback
     */
    protected void setClickableItem(ItemStack item, int slot, Consumer<ItemClick> callback, boolean closeAfter) {
-        this.setItemStack(slot, item);
-        this.addInventoryCondition((player, clickedSlot, clickType, inventoryConditionResult) -> {
-            if(clickedSlot == slot) {
-                if(closeAfter) player.closeInventory();
-                callback.accept(new ItemClick(player, this, clickedSlot, item, clickType));
-            }
-            inventoryConditionResult.setCancel(true);
-        });
+        ClickableItem clickableItem = new ClickableItem(item, slot, callback, closeAfter);
+        this.setItemStack(clickableItem.slot(), clickableItem.item());
+        this.clickableItems.put(clickableItem.slot(), clickableItem);
    }

    protected void setClickableItem(ItemStack item, int slot, Consumer<ItemClick> callback) {
@@ -47,7 +73,7 @@ public class InteractableInventory extends Inventory {
        this.setClickableItem(
            item,
            slot,
-            itemClick -> {
+            _ -> {
            }
        );
    }
@@ -62,7 +88,7 @@ public class InteractableInventory extends Inventory {
    /**
     * You may want to Override this method to get more generic click events
     */
-    protected void onClick(Player player, int slot, ClickType clickType, InventoryConditionResult inventoryConditionResult) {
+    protected void onClick(Player player, int slot, Click clickType) {

    }
 }
--- a/src/main/java/eu/mhsl/minenet/minigames/shared/inventory/ItemClick.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/shared/inventory/ItemClick.java
@@ -1,45 +0,0 @@
-package eu.mhsl.minenet.minigames.shared.inventory;
-
-import net.minestom.server.entity.Player;
-import net.minestom.server.inventory.Inventory;
-import net.minestom.server.inventory.click.ClickType;
-import net.minestom.server.item.ItemStack;
-
-public class ItemClick {
-    private final Player player;
-    private final InteractableInventory inventory;
-    private final int clickedSlot;
-    private final ItemStack item;
-    private final ClickType clickType;
-
-    /**
-     * Describes a click on an Item from an IntractableInventory
-     */
-    public ItemClick(Player player, InteractableInventory inventory, int clickedSlot, ItemStack item, ClickType clickType) {
-        this.player = player;
-        this.inventory = inventory;
-        this.clickedSlot = clickedSlot;
-        this.item = item;
-        this.clickType = clickType;
-    }
-
-    public Player getPlayer() {
-        return this.player;
-    }
-
-    public Inventory getInventory() {
-        return this.inventory;
-    }
-
-    public int getClickedSlot() {
-        return this.clickedSlot;
-    }
-
-    public ItemStack getItem() {
-        return this.item;
-    }
-
-    public ClickType getClickType() {
-        return this.clickType;
-    }
-}
--- a/src/main/java/eu/mhsl/minenet/minigames/util/BatchUtil.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/util/BatchUtil.java
@@ -1,12 +1,12 @@
 package eu.mhsl.minenet.minigames.util;

-import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
 import net.minestom.server.instance.InstanceContainer;
 import net.minestom.server.instance.batch.Batch;
 import net.minestom.server.instance.batch.ChunkBatch;
 import net.minestom.server.utils.chunk.ChunkUtils;

 import java.lang.reflect.Field;
+import java.util.Map;
 import java.util.concurrent.CompletableFuture;

 public class BatchUtil {
@@ -16,10 +16,13 @@ public class BatchUtil {
            field.setAccessible(true);

            @SuppressWarnings("unchecked")
-            Long2ObjectMap<ChunkBatch> chunkBatchesMap = (Long2ObjectMap<ChunkBatch>) field.get(batch);
+            Map<Long, ChunkBatch> chunkBatchesMap = (Map<Long, ChunkBatch>) field.get(batch);

-            return chunkBatchesMap.keySet().toLongArray();
-        } catch(NoSuchFieldException | IllegalAccessException e) {
+            long[] out = new long[chunkBatchesMap.size()];
+            int i = 0;
+            for (Long k : chunkBatchesMap.keySet()) out[i++] = k;
+            return out;
+        } catch (NoSuchFieldException | IllegalAccessException e) {
            throw new RuntimeException(e);
        }
    }
@@ -36,15 +39,9 @@ public class BatchUtil {
        long[] affectedChunks = BatchUtil.getAffectedChunks(batch);
        CompletableFuture<Void> loadChunksTask = ChunkUtils.optionalLoadAll(instance, affectedChunks, null);

-        Runnable completerTask = () -> {
-            System.out.println("COMPLETE");
-            future.complete(null);
-        };
+        Runnable completerTask = () -> future.complete(null);

-        loadChunksTask.thenRun(() -> {
-            System.out.println("BEGIN");
-            batch.apply(instance, completerTask);
-        });
+        loadChunksTask.thenRun(() -> batch.apply(instance, completerTask));

        try {
            future.get();
--- a/src/main/java/eu/mhsl/minenet/minigames/util/CommonProperties.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/util/CommonProperties.java
@@ -10,11 +10,4 @@ public class CommonProperties {
            this.put("east", "true");
        }
    };
-
-    public static Map<String, String> fenceNorthSouth = new HashMap<>() {
-        {
-            this.put("north", "true");
-            this.put("south", "true");
-        }
-    };
 }
--- a/src/main/java/eu/mhsl/minenet/minigames/util/Position.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/util/Position.java
@@ -33,15 +33,9 @@ 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));
-    }
 }
--- a/src/main/java/eu/mhsl/minenet/minigames/util/WeatherUtils.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/util/WeatherUtils.java
@@ -19,7 +19,6 @@ public class WeatherUtils {
        MinecraftServer.getSchedulerManager().submitTask(() -> {
            this.intensity += 0.1f;
            players.forEach(p -> p.sendPacket(new ChangeGameStatePacket(ChangeGameStatePacket.Reason.RAIN_LEVEL_CHANGE, this.intensity)));
-            System.out.println(this.intensity);
            if(this.intensity < 1) {
                return TaskSchedule.millis(500);
            } else {
--- a/src/main/java/eu/mhsl/minenet/minigames/world/generator/featureEnriched/CircularPlateGenerator.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/world/generator/featureEnriched/CircularPlateGenerator.java
@@ -38,8 +38,6 @@ public class CircularPlateGenerator extends HeightTerrainGenerator {
    @Override
    public void generate(@NotNull GenerationUnit unit) {
        this.execution.singleRun(() -> unit.fork(setter -> {
-            System.out.println(new Pos(-(this.radius + this.centerX), unit.absoluteStart().y(), -(this.radius + this.centerZ)));
-            System.out.println(new Pos(this.radius + this.centerX, this.height, this.radius + this.centerZ));
            GeneratorUtils.foreachXZ(
                new Pos(-(this.radius + this.centerX), unit.absoluteStart().y(), -(this.radius + this.centerZ)),
                new Pos(this.radius + this.centerX, this.height, this.radius + this.centerZ),
--- a/src/main/java/eu/mhsl/minenet/minigames/world/generator/terrain/HeightTerrainGenerator.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/world/generator/terrain/HeightTerrainGenerator.java
@@ -46,7 +46,6 @@ public class HeightTerrainGenerator extends BaseGenerator {
                double heightNoise = this.base.getNoise(bottomPoint.x(), bottomPoint.z());
                double noiseModifier = heightNoise * this.heightNoiseMultiplier.apply(bottomPoint);
                double heightModifier = NumberUtil.clamp(this.calculateHeight.apply(bottomPoint) + noiseModifier, 1d, unit.size().y());
-                if(heightModifier < 1) System.out.println("HEIGHT MODIFIER ILLEGAL");

                synchronized(this.batches) {
                    double batchNoise = this.batches.getNoise(bottomPoint.x(), bottomPoint.z());
@@ -69,8 +68,6 @@ public class HeightTerrainGenerator extends BaseGenerator {
                        Point absoluteHeight = bottomPoint.add(0, heightModifier, 0);
                        int seaLevel = this.calculateSeaLevel.apply(bottomPoint);
                        if(absoluteHeight.y() < seaLevel) {
-//                            System.out.println("HM:" + absoluteHeight.y() + " SL:" + seaLevel);
-//                            System.out.println("Filling from " + bottomPoint.y() + " to " + absoluteHeight.withY(seaLevel).y());
                            unit.modifier().fill(bottomPoint.withY(v -> v + heightModifier), absoluteHeight.add(1, 0, 1).withY(seaLevel), Block.WATER);
                        }
                    }
--- a/src/main/resources/lang/locales.map.csv
+++ b/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, der Spieler mit den wenigsten Toden gewinnt!
+description;Push your opponents off the Bridge;Stoße deine Gegener von der Brücke
 ;;
 ns:game_TrafficlightRace#;;
 name;Red light green light;Rotes licht, Grünes licht
@@ -170,16 +170,3 @@ 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
--- a/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.-1.-1.mca
+++ b/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.-1.-1.mca
--- a/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.-1.-2.mca
+++ b/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.-1.-2.mca
--- a/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.-1.0.mca
+++ b/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.-1.0.mca
--- a/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.-1.1.mca
+++ b/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.-1.1.mca
--- a/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.-1.2.mca
+++ b/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.-1.2.mca
--- a/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.-2.-1.mca
+++ b/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.-2.-1.mca
--- a/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.-2.-2.mca
+++ b/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.-2.-2.mca
--- a/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.-2.0.mca
+++ b/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.-2.0.mca
--- a/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.-2.1.mca
+++ b/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.-2.1.mca
--- a/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.-2.2.mca
+++ b/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.-2.2.mca
--- a/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.0.-1.mca
+++ b/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.0.-1.mca
--- a/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.0.-2.mca
+++ b/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.0.-2.mca
--- a/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.0.0.mca
+++ b/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.0.0.mca
--- a/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.0.1.mca
+++ b/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.0.1.mca
--- a/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.0.2.mca
+++ b/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.0.2.mca
--- a/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.1.-1.mca
+++ b/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.1.-1.mca
--- a/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.1.-2.mca
+++ b/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.1.-2.mca
--- a/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.1.0.mca
+++ b/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.1.0.mca
--- a/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.1.1.mca
+++ b/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.1.1.mca
--- a/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.1.2.mca
+++ b/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.1.2.mca
Author	SHA1	Message	Date
lars	8756cf2f17	removed unnecessary logging	2025-10-16 23:14:04 +02:00
lars	cfdf469c39	updated pvp library	2025-10-16 22:57:34 +02:00
lars	67d0fad071	updated to 1.21.10	2025-10-16 22:41:05 +02:00