Attempts first code cleanup

This commit is contained in:
2025-12-17 14:58:48 +01:00
parent 4480e0994f
commit bece76fa8c
22 changed files with 715 additions and 514 deletions

View File

@@ -2,7 +2,9 @@ package net.knarcraft.blockhunt.command;
import net.knarcraft.blockhunt.MemoryStorage;
import net.knarcraft.blockhunt.arena.Arena;
import net.knarcraft.blockhunt.arena.ArenaState;
import net.knarcraft.blockhunt.arena.ArenaGameState;
import net.knarcraft.blockhunt.arena.ArenaLocations;
import net.knarcraft.blockhunt.arena.ArenaOptions;
import net.knarcraft.blockhunt.config.MessageKey;
import net.knarcraft.blockhunt.manager.CommandManager;
import net.knarcraft.blockhunt.util.MessageHelper;
@@ -27,13 +29,16 @@ public class CreateCommand extends DefaultCommand {
} else {
if (MemoryStorage.pos1.get(player) != null && MemoryStorage.pos2.get(player) != null) {
if (MemoryStorage.pos1.get(player).getWorld().equals(MemoryStorage.pos2.get(player).getWorld())) {
Arena arena = new Arena(args[1], MemoryStorage.pos1.get(player), MemoryStorage.pos2.get(player),
ArenaOptions arenaOptions = new ArenaOptions(args[1], false,
false, false, false,
false, new ArrayList<>(), new ArrayList<>(), new ArrayList<>());
ArenaLocations arenaLocations = new ArenaLocations(MemoryStorage.pos1.get(player),
MemoryStorage.pos2.get(player), null, null, null, null);
Arena arena = new Arena(arenaOptions, arenaLocations,
12, 3, 1, 50, 20,
300, 30, 45, false,
false, false, false, false,
new ArrayList<>(), null, null, null, null,
new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), 10, 50,
8, new ArrayList<>(), ArenaState.WAITING, 0, new ArrayList<>(),
300, 30, 45,
new ArrayList<>(), 10, 50,
8, new ArrayList<>(), ArenaGameState.WAITING, 0, new ArrayList<>(),
Bukkit.getScoreboardManager().getNewScoreboard());
MemoryStorage.arenas.getFileConfiguration().set(args[1], arena);
MemoryStorage.arenas.save();