Author SHA1 Message Date
jannis 096b035503 fixed one issue in block battle 2026-08-21 09:22:19 +02:00
jannis 103bd23bf4 fixed issues after ending in colorjump 2026-08-10 18:16:03 +02:00
jannis b175433701 fixed issues after ending in colorjump 2026-08-10 13:41:35 +02:00
80 changed files with 13 additions and 18 deletions
-7
View File
@@ -3,11 +3,4 @@
<component name="CompilerConfiguration">
<bytecodeTargetLevel target="21" />
</component>
<component name="JavacSettings">
<option name="ADDITIONAL_OPTIONS_OVERRIDE">
<module name="Minigames" options="-Xlint:deprecation" />
<module name="Minigames.test" options="-Xlint:deprecation" />
<module name="eu.mhsl.minenet.Minigames.main" options="-Xlint:deprecation" />
</option>
</component>
</project>
@@ -26,7 +26,6 @@ import net.minestom.server.item.ItemStack;
import net.minestom.server.item.Material;
import net.minestom.server.timer.ExecutionType;
import net.minestom.server.timer.TaskSchedule;
import net.minestom.server.world.DimensionType;
import org.jetbrains.annotations.NotNull;
import java.io.IOException;
@@ -42,7 +41,7 @@ public class Bedwars extends StatelessGame {
public Bedwars() throws IOException {
super(Dimension.OVERWORLD.key, "Bedwars", new LastWinsScore());
this.setChunkLoader(new AnvilLoader(Resource.GAME_MAP.getPath().resolve("bedwars/test"), DimensionType.OVERWORLD.key()));
this.setChunkLoader(new AnvilLoader(Resource.GAME_MAP.getPath().resolve("bedwars/test")));
Configuration config = ConfigurationProvider.getProvider(YamlConfiguration.class).load(Resource.GAME_MAP.getPath().resolve("bedwars/test/config.yml").toFile());
List<String> teamNames = config.getStringList("setup.teams");
@@ -43,7 +43,7 @@ public class BlockBattle extends StatelessGame {
);
this.eventNode().addListener(FinalAttackEvent.class, finalAttackEvent -> {
if(this.isBeforeBeginning) finalAttackEvent.setCancelled(true);
if(!this.isRunning) finalAttackEvent.setCancelled(true);
finalAttackEvent.setBaseDamage(0);
((Player) finalAttackEvent.getTarget()).setHealth(20);
});
@@ -15,7 +15,6 @@ 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 net.minestom.server.world.DimensionType;
import org.jetbrains.annotations.NotNull;
import java.util.concurrent.CompletableFuture;
@@ -24,7 +23,7 @@ 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"), DimensionType.OVERWORLD.key()));
this.setChunkLoader(new AnvilLoader(Resource.GAME_MAP.getPath().resolve("boatRace/woodlandMansion")));
}
@Override
@@ -172,5 +172,9 @@ public class ColorJump extends StatelessGame {
this.getScore().insertResult(player);
player.setGameMode(GameMode.SPECTATOR);
}
if(!this.isBeforeBeginning && !this.isRunning) {
player.setGameMode(GameMode.SPECTATOR);
player.teleport(this.getSpawn());
}
}
}
@@ -12,7 +12,8 @@ import net.minestom.server.event.player.PlayerBlockBreakEvent;
import net.minestom.server.event.player.PlayerBlockInteractEvent;
import net.minestom.server.event.player.PlayerBlockPlaceEvent;
import net.minestom.server.instance.anvil.AnvilLoader;
import net.minestom.server.world.DimensionType;
import java.nio.file.Path;
public class Hub extends MineNetInstance implements Spawnable {
public static final Hub INSTANCE = new Hub();
@@ -20,7 +21,7 @@ public class Hub extends MineNetInstance implements Spawnable {
static {
MinecraftServer.getInstanceManager().registerInstance(INSTANCE);
INSTANCE.setChunkLoader(new AnvilLoader(Resource.HUB_MAP.getPath(), DimensionType.OVERWORLD.key()));
INSTANCE.setChunkLoader(new AnvilLoader(Resource.HUB_MAP.getPath()));
INSTANCE.eventNode()
.addListener(PlayerBlockBreakEvent.class, CommonEventHandles::cancel)
@@ -32,6 +33,7 @@ public class Hub extends MineNetInstance implements Spawnable {
private Hub() {
super(Dimension.THE_END.key);
this.setChunkLoader(new AnvilLoader(Path.of("maps/hub")));
this.setTime(18000);
this.defaultClock().pause();
@@ -18,7 +18,6 @@ import net.minestom.server.entity.Player;
import net.minestom.server.event.player.PlayerBlockBreakEvent;
import net.minestom.server.event.player.PlayerDisconnectEvent;
import net.minestom.server.instance.anvil.AnvilLoader;
import net.minestom.server.world.DimensionType;
import java.util.*;
import java.util.logging.Logger;
@@ -103,7 +102,7 @@ public class Room extends MineNetInstance implements Spawnable {
private void construct() {
MinecraftServer.getInstanceManager().registerInstance(this);
this.setChunkLoader(new AnvilLoader(Resource.LOBBY_MAP.getPath(), DimensionType.OVERWORLD.key()));
this.setChunkLoader(new AnvilLoader(Resource.LOBBY_MAP.getPath()));
this.gameSelector = new GameSelector();
this.gameSelector.setInstance(this, new Pos(0.5, 50, 19.5));
@@ -12,7 +12,6 @@ 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.world.DimensionType;
import java.util.Comparator;
import java.util.List;
@@ -30,7 +29,7 @@ public class TournamentDisplay extends MineNetInstance implements Spawnable {
public TournamentDisplay(Tournament tournament) {
super(Dimension.OVERWORLD.key);
this.setChunkLoader(new AnvilLoader(Resource.RESULT_DISPLAY.getPath(), DimensionType.OVERWORLD.key()));
this.setChunkLoader(new AnvilLoader(Resource.RESULT_DISPLAY.getPath()));
this.places = tournament.getPlaces();
this.tournament = tournament;