CivMC/Civ
1
0
Fork 0
mirror of https://github.com/CivMC/Civ.git synced 2026-07-18 00:20:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
okx-code
2024-10-15 01:24:35 +01:00
parent adfd8b2dbb
commit e28f767402
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/templates/stacks/minecraft.yml.j2
View File

@@ -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'

2
docker-compose.yml
View File

@@ -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'

6
plugins/kitpvp-paper/src/main/java/net/civmc/kitpvp/arena/ArenaManager.java
View File

@@ -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"));

2
plugins/kitpvp-paper/src/main/java/net/civmc/kitpvp/arena/gui/ConfirmDeletionGui.java
View File

@@ -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();
}