diff --git a/ansible/templates/stacks/minecraft.yml.j2 b/ansible/templates/stacks/minecraft.yml.j2 index c5679f538..60b7b0e42 100644 --- a/ansible/templates/stacks/minecraft.yml.j2 +++ b/ansible/templates/stacks/minecraft.yml.j2 @@ -140,7 +140,7 @@ services: TYPE: 'paper' VERSION: '1.21.1' EULA: 'TRUE' - PAPER_DOWNLOAD_URL: 'https://api.infernalsuite.com/v1/projects/asp/b7ed9f48-8785-4e26-97ca-f63915fc4ed2/download/0c4576c6-0b90-4fc4-b3ca-59862fa03831' + PAPER_DOWNLOAD_URL: 'https://api.infernalsuite.com/v1/projects/asp/b7ed9f48-8785-4e26-97ca-f63915fc4ed2/download/d2618508-3d8f-4d56-8d86-ce625a45c81d' REMOVE_OLD_MODS: 'TRUE' COPY_CONFIG_DEST: '/data' diff --git a/docker-compose.yml b/docker-compose.yml index a085699f4..1f85f1467 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -108,7 +108,7 @@ services: TYPE: 'paper' VERSION: '1.21.1' EULA: 'TRUE' - PAPER_DOWNLOAD_URL: 'https://api.infernalsuite.com/v1/projects/asp/b7ed9f48-8785-4e26-97ca-f63915fc4ed2/download/0c4576c6-0b90-4fc4-b3ca-59862fa03831' + PAPER_DOWNLOAD_URL: 'https://api.infernalsuite.com/v1/projects/asp/b7ed9f48-8785-4e26-97ca-f63915fc4ed2/download/d2618508-3d8f-4d56-8d86-ce625a45c81d' REMOVE_OLD_MODS: 'TRUE' COPY_CONFIG_DEST: '/data' diff --git a/plugins/kitpvp-paper/src/main/java/net/civmc/kitpvp/arena/ArenaManager.java b/plugins/kitpvp-paper/src/main/java/net/civmc/kitpvp/arena/ArenaManager.java index 0c3bbadc6..8f4b9e14a 100644 --- a/plugins/kitpvp-paper/src/main/java/net/civmc/kitpvp/arena/ArenaManager.java +++ b/plugins/kitpvp-paper/src/main/java/net/civmc/kitpvp/arena/ArenaManager.java @@ -60,15 +60,15 @@ public class ArenaManager { return new ArrayList<>(arenas.sequencedValues()); } - public void deleteArena(PlayerProfile owner, Player player) { + public void deleteArena(PlayerProfile owner) { Arena arena = arenas.remove(owner.getId()).arena(); - String worldName = getArenaName(arena.name(), player.getPlayerProfile()); + String worldName = getArenaName(arena.name(), owner); World world = Bukkit.getWorld(worldName); if (world != null) { Location spawn = this.spawn.getSpawn(); for (Player worldPlayer : world.getPlayers()) { if (spawn != null) { - player.sendMessage(Component.text("The arena you were in was deleted, so you have been teleported to spawn.", NamedTextColor.GREEN)); + worldPlayer.sendMessage(Component.text("The arena you were in was deleted, so you have been teleported to spawn.", NamedTextColor.GREEN)); worldPlayer.teleport(spawn); } else { worldPlayer.kick(Component.text("The arena you were in was deleted")); diff --git a/plugins/kitpvp-paper/src/main/java/net/civmc/kitpvp/arena/gui/ConfirmDeletionGui.java b/plugins/kitpvp-paper/src/main/java/net/civmc/kitpvp/arena/gui/ConfirmDeletionGui.java index 67d602faa..486e630de 100644 --- a/plugins/kitpvp-paper/src/main/java/net/civmc/kitpvp/arena/gui/ConfirmDeletionGui.java +++ b/plugins/kitpvp-paper/src/main/java/net/civmc/kitpvp/arena/gui/ConfirmDeletionGui.java @@ -33,7 +33,7 @@ public class ConfirmDeletionGui { inventory.setSlot(new Clickable(yes) { @Override protected void clicked(@NotNull Player clicker) { - manager.deleteArena(owner, player); + manager.deleteArena(owner); clicker.sendMessage(Component.text("Deleted arena.", NamedTextColor.GREEN)); clicker.closeInventory(); }