From ee192c1035768513f773a8a888e2f968e5a77b05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20M=C3=BCller?= Date: Fri, 27 Dec 2024 10:58:07 +0100 Subject: [PATCH] fixed some bugs --- .../instance/game/stateless/types/spleef/Spleef.java | 1 + .../instance/game/stateless/types/tntrun/TntRun.java | 11 ++++------- src/main/resources/lang/locales.map.csv | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/spleef/Spleef.java b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/spleef/Spleef.java index be73efd..d0b5969 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/spleef/Spleef.java +++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/spleef/Spleef.java @@ -78,6 +78,7 @@ public class Spleef extends StatelessGame { } private void destroyBlock(PlayerStartDiggingEvent event) { + if(!isRunning) return; setBlock(event.getBlockPosition(), Block.AIR); } diff --git a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/tntrun/TntRun.java b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/tntrun/TntRun.java index db962ec..b05032e 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/tntrun/TntRun.java +++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/tntrun/TntRun.java @@ -7,10 +7,7 @@ import eu.mhsl.minenet.minigames.util.BatchUtil; import eu.mhsl.minenet.minigames.world.generator.terrain.CircularPlateTerrainGenerator; import net.minestom.server.MinecraftServer; import net.minestom.server.coordinate.Pos; -import net.minestom.server.entity.Entity; -import net.minestom.server.entity.EntityType; import net.minestom.server.entity.GameMode; -import net.minestom.server.entity.metadata.other.PrimedTntMeta; import net.minestom.server.event.player.PlayerMoveEvent; import net.minestom.server.instance.batch.AbsoluteBlockBatch; import net.minestom.server.instance.block.Block; @@ -67,10 +64,10 @@ public class TntRun extends StatelessGame { setBlock(firstLocation, Block.AIR); setBlock(secondLocation, Block.AIR); - Entity fallingTnt = new Entity(EntityType.TNT); - PrimedTntMeta fallingTntMeta = (PrimedTntMeta) fallingTnt.getEntityMeta(); - fallingTntMeta.setFuseTime(20); - fallingTnt.setInstance(this, secondLocation); +// Entity fallingTnt = new Entity(EntityType.TNT); +// PrimedTntMeta fallingTntMeta = (PrimedTntMeta) fallingTnt.getEntityMeta(); +// fallingTntMeta.setFuseTime(20); +// fallingTnt.setInstance(this, secondLocation); } } } diff --git a/src/main/resources/lang/locales.map.csv b/src/main/resources/lang/locales.map.csv index 249f47e..7b00cc1 100644 --- a/src/main/resources/lang/locales.map.csv +++ b/src/main/resources/lang/locales.map.csv @@ -36,7 +36,7 @@ join_notFound;Lobby not found: ;Lobby konnte nicht gefunden werden: ;; ns:score#;; result;Results;Ergebnisse -thanks;Thank you for Playing;Danke für's spielen +thanks;Thank you for Playing;Danke für's Spielen finish;You did it;Du hast es geschafft death;You are out;Du hast verloren done;Finish;Fertig