From 7516cf585448a9b4dd72610ab7dfa38f32bac8b1 Mon Sep 17 00:00:00 2001 From: YoyoNow Date: Tue, 6 Aug 2024 15:39:59 +0200 Subject: [PATCH] Hotfix ArenaMode with RankCommand --- .../src/de/steamwar/messages/BungeeCore.properties | 3 +-- .../src/de/steamwar/messages/BungeeCore_de.properties | 2 +- .../src/de/steamwar/velocitycore/ArenaMode.java | 7 +++++++ .../steamwar/velocitycore/commands/RankCommand.java | 11 +++++------ 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/VelocityCore/src/de/steamwar/messages/BungeeCore.properties b/VelocityCore/src/de/steamwar/messages/BungeeCore.properties index d126ac74..fe118680 100644 --- a/VelocityCore/src/de/steamwar/messages/BungeeCore.properties +++ b/VelocityCore/src/de/steamwar/messages/BungeeCore.properties @@ -664,10 +664,9 @@ ARENA_NOT_FOUND=§cThe specified arena could not be found #Rank RANK_PLAYER_NOT_FOUND=§cPlayer not found RANK_PLAYER_FOUND=§eRank §7of §e{0} -RANK_HEADER=§e{0} {1} +RANK_HEADER={0} §e{1} {2} RANK_UNPLACED=§7unranked RANK_PLACED=§e{0}§8. §7with §e{1} §7Elo§8. -RANK_EMBLEM=§7Emblem§8: {0} #Fabric Mod Sender MODIFICATION_BAN_MESSAGE=You tried to bypass / modify the FabricModSender! diff --git a/VelocityCore/src/de/steamwar/messages/BungeeCore_de.properties b/VelocityCore/src/de/steamwar/messages/BungeeCore_de.properties index 71d8ce9b..2dea174b 100644 --- a/VelocityCore/src/de/steamwar/messages/BungeeCore_de.properties +++ b/VelocityCore/src/de/steamwar/messages/BungeeCore_de.properties @@ -639,7 +639,7 @@ ARENA_NOT_FOUND=§cDie angegebene Arena konnte nicht gefunden werden #Rank RANK_PLAYER_NOT_FOUND=§cSpieler nicht gefunden RANK_PLAYER_FOUND=§eRang §7von §e{0} -RANK_HEADER=§e{0} {1} +RANK_HEADER={0} §e{1} {2} RANK_UNPLACED=§7unplatziert RANK_PLACED=§e{0}§8. §7mit §e{1} §7Elo§8. RANK_EMBLEM=§7Emblem§8: {0} diff --git a/VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java b/VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java index a185dcb8..5595d9d9 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java +++ b/VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java @@ -118,4 +118,11 @@ public class ArenaMode extends GameModeConfig { return getServer().getChatNames().isEmpty(); } + public String getSchemTypeOrInternalName() { + Schematic schematic = getSchematic(); + if (schematic == null) { + return internalName; + } + return schematic.getType(); + } } diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/RankCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/RankCommand.java index 5254d52c..4d68f07b 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/commands/RankCommand.java +++ b/VelocityCore/src/de/steamwar/velocitycore/commands/RankCommand.java @@ -19,12 +19,12 @@ package de.steamwar.velocitycore.commands; -import de.steamwar.velocitycore.ArenaMode; -import de.steamwar.messages.Message; import de.steamwar.command.SWCommand; import de.steamwar.messages.Chatter; +import de.steamwar.messages.Message; import de.steamwar.sql.SteamwarUser; import de.steamwar.sql.UserElo; +import de.steamwar.velocitycore.ArenaMode; import java.util.Optional; @@ -48,17 +48,16 @@ public class RankCommand extends SWCommand { if (!mode.isRanked()) continue; - Optional elo = UserElo.getElo(user.getId(), mode.getSchemType()); + Optional elo = UserElo.getElo(user.getId(), mode.getSchemTypeOrInternalName()); Message eloMsg; if (elo.isPresent()) { - int placement = UserElo.getPlacement(elo.get(), mode.getSchemType()); + int placement = UserElo.getPlacement(elo.get(), mode.getSchemTypeOrInternalName()); eloMsg = new Message("RANK_PLACED", placement, elo.get()); } else { eloMsg = new Message("RANK_UNPLACED"); } - sender.prefixless("RANK_HEADER", mode.getChatName(), eloMsg); - sender.prefixless("RANK_EMBLEM", UserElo.getEmblemProgression(mode.getChatName(), user.getId())); + sender.prefixless("RANK_HEADER", UserElo.getEmblemProgression(mode.getChatName(), user.getId()), mode.getChatName(), eloMsg); } } }