Jaki/SteamWar
1
0
Fork 0
forked from SteamWar/SteamWar
Code Pull Requests Activity

Hotfix ArenaMode with RankCommand

Browse Source
This commit is contained in:
YoyoNow
2024-08-06 15:39:59 +02:00
parent a53fd19887
commit 7516cf5854
4 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VelocityCore/src/de/steamwar/messages/BungeeCore.properties
+1 -2
View File
@@ -664,10 +664,9 @@ ARENA_NOT_FOUND=§cThe specified arena could not be found
#Rank #Rank
RANK_PLAYER_NOT_FOUND=§cPlayer not found RANK_PLAYER_NOT_FOUND=§cPlayer not found
RANK_PLAYER_FOUND=§eRank §7of §e{0} RANK_PLAYER_FOUND=§eRank §7of §e{0}
RANK_HEADER=§e{0} {1} RANK_HEADER={0} §e{1} {2}
RANK_UNPLACED=§7unranked RANK_UNPLACED=§7unranked
RANK_PLACED=§e{0}§8. §7with §e{1} §7Elo§8. RANK_PLACED=§e{0}§8. §7with §e{1} §7Elo§8.
RANK_EMBLEM=§7Emblem§8: {0}
#Fabric Mod Sender #Fabric Mod Sender
MODIFICATION_BAN_MESSAGE=You tried to bypass / modify the FabricModSender! MODIFICATION_BAN_MESSAGE=You tried to bypass / modify the FabricModSender!
VelocityCore/src/de/steamwar/messages/BungeeCore_de.properties
+1 -1
View File
@@ -639,7 +639,7 @@ ARENA_NOT_FOUND=§cDie angegebene Arena konnte nicht gefunden werden
#Rank #Rank
RANK_PLAYER_NOT_FOUND=§cSpieler nicht gefunden RANK_PLAYER_NOT_FOUND=§cSpieler nicht gefunden
RANK_PLAYER_FOUND=§eRang §7von §e{0} RANK_PLAYER_FOUND=§eRang §7von §e{0}
RANK_HEADER=§e{0} {1} RANK_HEADER={0} §e{1} {2}
RANK_UNPLACED=§7unplatziert RANK_UNPLACED=§7unplatziert
RANK_PLACED=§e{0}§8. §7mit §e{1} §7Elo§8. RANK_PLACED=§e{0}§8. §7mit §e{1} §7Elo§8.
RANK_EMBLEM=§7Emblem§8: {0} RANK_EMBLEM=§7Emblem§8: {0}
VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java
+7
View File
@@ -118,4 +118,11 @@ public class ArenaMode extends GameModeConfig {
return getServer().getChatNames().isEmpty(); return getServer().getChatNames().isEmpty();
} }
public String getSchemTypeOrInternalName() {
Schematic schematic = getSchematic();
if (schematic == null) {
return internalName;
}
return schematic.getType();
}
} }
VelocityCore/src/de/steamwar/velocitycore/commands/RankCommand.java
+5 -6
View File
@@ -19,12 +19,12 @@
package de.steamwar.velocitycore.commands; package de.steamwar.velocitycore.commands;
import de.steamwar.velocitycore.ArenaMode;
import de.steamwar.messages.Message;
import de.steamwar.command.SWCommand; import de.steamwar.command.SWCommand;
import de.steamwar.messages.Chatter; import de.steamwar.messages.Chatter;
import de.steamwar.messages.Message;
import de.steamwar.sql.SteamwarUser; import de.steamwar.sql.SteamwarUser;
import de.steamwar.sql.UserElo; import de.steamwar.sql.UserElo;
import de.steamwar.velocitycore.ArenaMode;
import java.util.Optional; import java.util.Optional;
@@ -48,17 +48,16 @@ public class RankCommand extends SWCommand {
if (!mode.isRanked()) if (!mode.isRanked())
continue; continue;
Optional<Integer> elo = UserElo.getElo(user.getId(), mode.getSchemType()); Optional<Integer> elo = UserElo.getElo(user.getId(), mode.getSchemTypeOrInternalName());
Message eloMsg; Message eloMsg;
if (elo.isPresent()) { 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()); eloMsg = new Message("RANK_PLACED", placement, elo.get());
} else { } else {
eloMsg = new Message("RANK_UNPLACED"); eloMsg = new Message("RANK_UNPLACED");
} }
sender.prefixless("RANK_HEADER", mode.getChatName(), eloMsg); sender.prefixless("RANK_HEADER", UserElo.getEmblemProgression(mode.getChatName(), user.getId()), mode.getChatName(), eloMsg);
sender.prefixless("RANK_EMBLEM", UserElo.getEmblemProgression(mode.getChatName(), user.getId()));
} }
} }
} }