diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandban.java b/Essentials/src/com/earth2me/essentials/commands/Commandban.java index 40654551f..9c897aae0 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandban.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandban.java @@ -25,7 +25,7 @@ public class Commandban extends EssentialsCommand if (server.matchPlayer(args[0]).isEmpty()) { ((CraftServer)server).getHandle().a(args[0]); - sender.sendMessage(Util.format("playerBanned", args[0])); + server.broadcastMessage(Util.format("playerBanned", args[0], Util.i18n("defaultBanReason"))); } else { @@ -42,7 +42,7 @@ public class Commandban extends EssentialsCommand } player.kickPlayer(banReason); ((CraftServer)server).getHandle().a(player.getName()); - sender.sendMessage(Util.format("playerBanned", player.getName())); + server.broadcastMessage(Util.format("playerBanned", player.getName(), banReason)); } ess.loadBanList(); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkick.java b/Essentials/src/com/earth2me/essentials/commands/Commandkick.java index ba9c2153a..a20f654da 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandkick.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandkick.java @@ -34,6 +34,8 @@ public class Commandkick extends EssentialsCommand } charge(sender); - u.kickPlayer(args.length > 1 ? getFinalArg(args, 1) : Util.i18n("kickDefault")); + final String kickReason = args.length > 1 ? getFinalArg(args, 1) : Util.i18n("kickDefault"); + u.kickPlayer(kickReason); + server.broadcastMessage(Util.format("playerKicked", u.getName(), kickReason)); } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtempban.java b/Essentials/src/com/earth2me/essentials/commands/Commandtempban.java index e4a151f38..12e514362 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtempban.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtempban.java @@ -45,7 +45,7 @@ public class Commandtempban extends EssentialsCommand p.setBanTimeout(banTimestamp); p.kickPlayer(banReason); ((CraftServer)server).getHandle().a(p.getName()); - sender.sendMessage(Util.format("playerBanned", p.getName())); + server.broadcastMessage(Util.format("playerBanned", p.getName(), banReason)); Essentials.getStatic().loadBanList(); } } diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties index 1a8a00b4c..b619cf2ab 100644 --- a/Essentials/src/messages.properties +++ b/Essentials/src/messages.properties @@ -206,10 +206,11 @@ onlySunStorm = /weather only supports sun/storm. parseError = Error parsing {0} on line {1} pendingTeleportCancelled = \u00a7cPending teleportation request cancelled. permissionsError = Missing Permissions/GroupManager; chat prefixes/suffixes will be disabled. -playerBanned = \u00a7cPlayer {0} banned +playerBanned = \u00a7cPlayer {0} banned: {1} playerInJail = \u00a7cPlayer is already in jail {0}. playerJailed = \u00a77Player {0} jailed. playerJailedFor = \u00a77Player {0} jailed for {1}. +playerKicked = \u00a7cPlayer {0} kicked: {1} playerNeverOnServer = \u00a7cPlayer {0} was never on this server. playerNotFound = \u00a7cPlayer not found. pong = Pong! diff --git a/Essentials/src/messages_da.properties b/Essentials/src/messages_da.properties index 46f4f4179..4a1703d38 100644 --- a/Essentials/src/messages_da.properties +++ b/Essentials/src/messages_da.properties @@ -208,10 +208,11 @@ onlySunStorm = /weather only supports sun/storm. parseError = Fejl ved parsing {0} p\u00e5 linje {1} pendingTeleportCancelled = \u00a7cVentende teleportations anmodning aflyst. permissionsError = Mangler Permissions/GroupManager; chat pr\u00e6fikser/suffikser vil v\u00e6re sl\u00e5et fra. -playerBanned = \u00a7cSpiller {0} bannet +playerBanned = \u00a7cSpiller {0} bannet: {1} playerInJail = \u00a7cSpiller er allerede i f\u00e6ngsel {0}. playerJailed = \u00a77Spiller {0} f\u00e6ngslet. playerJailedFor = \u00a77Spiller {0} f\u00e6ngslet for {1}. +playerKicked = \u00a7cPlayer {0} kicked: {1} playerNeverOnServer = \u00a7cSpiller {0} var aldrig p\u00e5 denne server. playerNotFound = \u00a7cSpiller ikke fundet. pong = Pong! diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties index e265976d9..e3f5b181f 100644 --- a/Essentials/src/messages_de.properties +++ b/Essentials/src/messages_de.properties @@ -206,10 +206,11 @@ onlySunStorm = /weather unterst\u00fctzt nur sun/storm. parseError = Fehler beim Parsen von {0} in Zeile {1} pendingTeleportCancelled = \u00a7cLaufende Teleportierung abgebrochen. permissionsError = Permissions/GroupManager fehlt; Chat-Prefixe/-Suffixe sind ausgeschaltet. -playerBanned = \u00a7cSpieler {0} gesperrt. +playerBanned = \u00a7cSpieler {0} gesperrt: {1} playerInJail = \u00a7cSpieler ist bereits in Gef\u00e4ngnis {0}. playerJailed = \u00a77Spieler {0} eingesperrt. playerJailedFor = \u00a77Spieler {0} eingesperrt f\u00fcr {1}. +playerKicked = \u00a7cSpieler {0} rausgeworfen: {1} playerNeverOnServer = \u00a7cSpieler {0} war niemals auf diesem Server. playerNotFound = \u00a7cSpieler nicht gefunden. pong = Pong! diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties index 1a8a00b4c..b619cf2ab 100644 --- a/Essentials/src/messages_en.properties +++ b/Essentials/src/messages_en.properties @@ -206,10 +206,11 @@ onlySunStorm = /weather only supports sun/storm. parseError = Error parsing {0} on line {1} pendingTeleportCancelled = \u00a7cPending teleportation request cancelled. permissionsError = Missing Permissions/GroupManager; chat prefixes/suffixes will be disabled. -playerBanned = \u00a7cPlayer {0} banned +playerBanned = \u00a7cPlayer {0} banned: {1} playerInJail = \u00a7cPlayer is already in jail {0}. playerJailed = \u00a77Player {0} jailed. playerJailedFor = \u00a77Player {0} jailed for {1}. +playerKicked = \u00a7cPlayer {0} kicked: {1} playerNeverOnServer = \u00a7cPlayer {0} was never on this server. playerNotFound = \u00a7cPlayer not found. pong = Pong! diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties index eb7bac49e..0c00178a3 100644 --- a/Essentials/src/messages_fr.properties +++ b/Essentials/src/messages_fr.properties @@ -206,10 +206,11 @@ onlySunStorm = /weather only supports sun/storm. parseError = Erreur de conversion {0} \u00e0 la ligne {1} pendingTeleportCancelled = \u00a7cRequete de t\u00e9l\u00e9portation annul\u00e9e. permissionsError = Permissions/GroupManager manquant, les pr\u00e9fixes et suffixes ne seront pas affich\u00e9s. -playerBanned = \u00a7cLe joueur {0} a \u00e9t\u00e9 banni +playerBanned = \u00a7cLe joueur {0} a \u00e9t\u00e9 banni: {1} playerInJail = \u00a7cLe joueur est d\u00e9j\u00e0 dans la prison {0}. playerJailed = \u00a77Le joueur {0} a \u00e9t\u00e9 emprisonn\u00e9. playerJailedFor = \u00a77{0} a \u00e9t\u00e9 emprisonn\u00e9 pour {1}. +playerKicked = \u00a7cPlayer {0} kicked: {1} playerNeverOnServer = \u00a7cLe joueur {0} n''a jamais \u00e9t\u00e9 sur le serveur. playerNotFound = \u00a7cLe joueur est introuvable. pong = Pong! diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties index f7655e472..00a0ed1ef 100644 --- a/Essentials/src/messages_nl.properties +++ b/Essentials/src/messages_nl.properties @@ -207,10 +207,11 @@ onlySunStorm = /weather only supports sun/storm. parseError = Fout bij ontleding {0} op regel {1} pendingTeleportCancelled = \u00a7cAangevraagde teleportatie afgelast. permissionsError = Vermisde Permissions/GroupManager; chat prefixes/suffixes worden uitgeschakeld. -playerBanned = \u00a7cSpeler {0} is geband +playerBanned = \u00a7cSpeler {0} is geband: {1} playerInJail = \u00a7cSpeler zit al in de gevangenis {0}. playerJailed = \u00a77Speler {0} is in de gevangenis gezet. playerJailedFor = \u00a77Speler {0} is in de gevangenis gezet voor {1}. +playerKicked = \u00a7cPlayer {0} kicked: {1} playerNeverOnServer = \u00a7cSpeler {0} is nooit op deze server geweest. playerNotFound = \u00a7cSpeler niet gevonden. pong = Pong!