From 89b81a3288526e0a921dc594daa073a0d2f08072 Mon Sep 17 00:00:00 2001 From: jannis Date: Sun, 25 Oct 2026 16:35:48 +0100 Subject: [PATCH 1/3] fixed spawning issues in tetris --- .../minigames/instance/game/stateless/types/tetris/Tetris.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git 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 index 0f3336f..b293b61 100644 --- 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 @@ -147,10 +147,10 @@ class Tetris extends StatelessGame { TetrisGame tetrisGame = this.tetrisGames.get(p); - p.teleport(tetrisGame.getPlayerSpawnPosition()); tetrisGame.sidebar.addViewer(p); MinecraftServer.getSchedulerManager().scheduleTask(() -> { + p.teleport(tetrisGame.getPlayerSpawnPosition()); Entity ghostBlock = new Entity(EntityType.BLOCK_DISPLAY); ((BlockDisplayMeta) ghostBlock.getEntityMeta()).setBlockState(Block.AIR); ghostBlock.setNoGravity(true); @@ -159,7 +159,6 @@ class Tetris extends StatelessGame { return TaskSchedule.stop(); }, TaskSchedule.nextTick()); - return super.onPlayerJoin(p); } From f23495ecdd3300df525a3807dc16dde4a49d26ca Mon Sep 17 00:00:00 2001 From: jannis Date: Sun, 25 Oct 2026 17:01:20 +0100 Subject: [PATCH 2/3] fixed knockback issue in high ground --- .../stateless/types/highGround/HighGround.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git 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 index 193ec36..712f8c4 100644 --- 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 @@ -51,15 +51,18 @@ class HighGround extends StatelessGame { this.eventNode().addListener( EntityKnockbackEvent.class, - entityKnockbackEvent -> entityKnockbackEvent.setSettings( + entityKnockbackEvent -> { + if(entityKnockbackEvent.getEntity().getVelocity().y() > 4) { entityKnockbackEvent.setCancelled(true); return; } + entityKnockbackEvent.setSettings( KnockbackSettings.builder() .horizontal(1.1) - .vertical(KnockbackSettings.DEFAULT.vertical()) - .verticalLimit(KnockbackSettings.DEFAULT.verticalLimit()) - .extraHorizontal(KnockbackSettings.DEFAULT.extraHorizontal()) - .extraVertical(KnockbackSettings.DEFAULT.extraVertical()) + .vertical(0) + .verticalLimit(0) + .extraHorizontal(0.5) + .extraVertical(0) .build() - ) + ); + } ); this.eventNode().addListener(InstanceTickEvent.class, instanceTickEvent -> { From 9d779a4879dbad2c0d18d5c4a6ad9179549e879a Mon Sep 17 00:00:00 2001 From: jannis Date: Wed, 28 Oct 2026 22:07:45 +0100 Subject: [PATCH 3/3] fixed root cause of knockback issue in high ground --- .../types/highGround/HighGround.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git 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 index 712f8c4..e13986e 100644 --- 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 @@ -9,6 +9,7 @@ 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.ServerFlag; import net.minestom.server.coordinate.Pos; import net.minestom.server.entity.Player; import net.minestom.server.event.instance.InstanceTickEvent; @@ -52,16 +53,16 @@ class HighGround extends StatelessGame { this.eventNode().addListener( EntityKnockbackEvent.class, entityKnockbackEvent -> { - if(entityKnockbackEvent.getEntity().getVelocity().y() > 4) { entityKnockbackEvent.setCancelled(true); return; } + double tps = ServerFlag.SERVER_TICKS_PER_SECOND; entityKnockbackEvent.setSettings( - KnockbackSettings.builder() - .horizontal(1.1) - .vertical(0) - .verticalLimit(0) - .extraHorizontal(0.5) - .extraVertical(0) - .build() - ); + KnockbackSettings.builder() + .horizontal(1.1) + .vertical(KnockbackSettings.DEFAULT.vertical() / tps) + .verticalLimit(KnockbackSettings.DEFAULT.verticalLimit() / tps) + .extraHorizontal(KnockbackSettings.DEFAULT.extraHorizontal() / tps) + .extraVertical(KnockbackSettings.DEFAULT.extraVertical() / tps) + .build() + ); } );