forked from SteamWar/SteamWar
Hotfix ArenaMode with RankCommand
This commit is contained in:
@@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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<Integer> elo = UserElo.getElo(user.getId(), mode.getSchemType());
|
||||
Optional<Integer> 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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user