From d8d4d2d04bc4029aa9608a2f28a3af085701f128 Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Sat, 30 Jan 2021 11:17:37 +0100 Subject: [PATCH] Fix Merge Confilcts --- src/de/steamwar/bungeecore/commands/UnbanCommand.java | 5 ++--- src/de/steamwar/messages/BungeeCore.properties | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/de/steamwar/bungeecore/commands/UnbanCommand.java b/src/de/steamwar/bungeecore/commands/UnbanCommand.java index acd5a79..58c0a6f 100644 --- a/src/de/steamwar/bungeecore/commands/UnbanCommand.java +++ b/src/de/steamwar/bungeecore/commands/UnbanCommand.java @@ -19,7 +19,6 @@ package de.steamwar.bungeecore.commands; -import de.steamwar.bungeecore.BungeeCore; import de.steamwar.bungeecore.Message; import de.steamwar.bungeecore.sql.SteamwarUser; import net.md_5.bungee.api.CommandSender; @@ -45,11 +44,11 @@ public class UnbanCommand extends BasicCommand { return; if(!target.isBanned()) { - BungeeCore.send(sender, BungeeCore.CHAT_PREFIX + "Der Spieler ist nicht gebannt."); + Message.send("UNBAN_NOT_BANNED", sender); return; } Message.send("UNBAN_UNBANNED", sender, target.getUserName()); - target.ban(Timestamp.from(new Date().toInstant()), ""); + target.ban(Timestamp.from(new Date().toInstant()), "Unban", SteamwarUser.get(sender.getName()).getId(), false); } } diff --git a/src/de/steamwar/messages/BungeeCore.properties b/src/de/steamwar/messages/BungeeCore.properties index a32c251..84038b2 100644 --- a/src/de/steamwar/messages/BungeeCore.properties +++ b/src/de/steamwar/messages/BungeeCore.properties @@ -410,6 +410,7 @@ TP_NOT_FOUND=§cKonnte das angegebene Ziel nicht finden. #UnbanCommand UNBAN_USAGE=§8/§7unban §8[§eSpieler§8] +UNBAN_NOT_BANNED=§cDer Spieler ist nicht gebannt. UNBAN_UNBANNED=Du hast {0} entbannt. #UnignoreCommand