diff --git a/core/src/main/java/com/rettichlp/unicacityaddon/commands/faction/chat/ToggleShoutCommand.java b/core/src/main/java/com/rettichlp/unicacityaddon/commands/faction/chat/ToggleShoutCommand.java index 724330be..1b63ebd1 100644 --- a/core/src/main/java/com/rettichlp/unicacityaddon/commands/faction/chat/ToggleShoutCommand.java +++ b/core/src/main/java/com/rettichlp/unicacityaddon/commands/faction/chat/ToggleShoutCommand.java @@ -3,6 +3,7 @@ import com.rettichlp.unicacityaddon.UnicacityAddon; import com.rettichlp.unicacityaddon.base.AddonPlayer; import com.rettichlp.unicacityaddon.base.builder.TabCompletionBuilder; +import com.rettichlp.unicacityaddon.base.enums.faction.Faction; import com.rettichlp.unicacityaddon.base.registry.UnicacityCommand; import com.rettichlp.unicacityaddon.base.registry.annotation.UCCommand; @@ -24,13 +25,18 @@ public ToggleShoutCommand(UnicacityAddon unicacityAddon, UCCommand ucCommand) { @Override public boolean execute(String[] arguments) { AddonPlayer p = this.unicacityAddon.player(); - p.setShouting(!p.isShouting()); + + boolean isCivilian = p.getFaction().equals(Faction.NULL); + p.setShouting(!p.isShouting() && !isCivilian); if (p.isShouting()) { p.sendInfoMessage("Ab sofort schreist du jede Nachricht."); + } else if (isCivilian){ + p.sendInfoMessage("Diese Funktion ist nur für Fraktionsmitglieder verfügbar."); } else { p.sendInfoMessage("Ab sofort redest du wieder normal."); } + return true; } diff --git a/core/src/main/java/com/rettichlp/unicacityaddon/listener/AccountListener.java b/core/src/main/java/com/rettichlp/unicacityaddon/listener/AccountListener.java index e13b438f..26a83dfd 100644 --- a/core/src/main/java/com/rettichlp/unicacityaddon/listener/AccountListener.java +++ b/core/src/main/java/com/rettichlp/unicacityaddon/listener/AccountListener.java @@ -140,23 +140,6 @@ public void run() { if (PatternHandler.ACCOUNT_TREUEBONUS_PATTERN.matcher(msg).find()) { new Thread(() -> { GamePlay gamePlay = this.unicacityAddon.api().sendStatisticRequest().getGameplay(); - - p.sendMessage(Message.getBuilder() - .space().space() - .of("-").color(ColorCode.DARK_GRAY).advance().space() - .of("Tode").color(ColorCode.GOLD).advance() - .of(":").color(ColorCode.DARK_GRAY).advance().space() - .of(gamePlay.getDeaths() + " Tode").color(ColorCode.RED).advance() - .createComponent()); - - p.sendMessage(Message.getBuilder() - .space().space() - .of("-").color(ColorCode.DARK_GRAY).advance().space() - .of("Kills").color(ColorCode.GOLD).advance() - .of(":").color(ColorCode.DARK_GRAY).advance().space() - .of(gamePlay.getKills() + " Kills").color(ColorCode.RED).advance() - .createComponent()); - p.sendMessage(Message.getBuilder() .space().space() .of("-").color(ColorCode.DARK_GRAY).advance().space()