minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-17 12:01:20 +02:00
Code Issues Releases Wiki Activity

porting 341cb89bb7 :: Multiline kick messages and tempban countdown.

Browse Source
This commit is contained in:
Iaccidentally
2013-01-09 16:31:24 -05:00
parent 4d4a3142f7
commit 00237ae74f
4 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Essentials/src/net/ess3/commands/Commandkick.java
View File

@@ -1,11 +1,11 @@
package net.ess3.commands; package net.ess3.commands;
import static net.ess3.I18n._;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import net.ess3.Console; import net.ess3.Console;
import static net.ess3.I18n._;
import net.ess3.api.IUser; import net.ess3.api.IUser;
import net.ess3.permissions.Permissions; import net.ess3.permissions.Permissions;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
public class Commandkick extends EssentialsCommand public class Commandkick extends EssentialsCommand
@@ -23,7 +23,8 @@ public class Commandkick extends EssentialsCommand
{ {
throw new Exception(_("kickExempt")); throw new Exception(_("kickExempt"));
} }
final String kickReason = args.length > 1 ? getFinalArg(args, 1) : _("kickDefault"); String kickReason = args.length > 1 ? getFinalArg(args, 1) : _("kickDefault");
kickReason = kickReason.replace("\\n", "\n");
user.getPlayer().kickPlayer(kickReason); user.getPlayer().kickPlayer(kickReason);
final String senderName = sender instanceof IUser ? ((IUser)sender).getPlayer().getDisplayName() : Console.NAME; final String senderName = sender instanceof IUser ? ((IUser)sender).getPlayer().getDisplayName() : Console.NAME;

6
Essentials/src/net/ess3/commands/Commandkickall.java
View File

@@ -1,9 +1,9 @@
package net.ess3.commands; package net.ess3.commands;
import static net.ess3.I18n._; import static net.ess3.I18n._;
import net.ess3.api.IUser;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import net.ess3.api.IUser;
public class Commandkickall extends EssentialsCommand public class Commandkickall extends EssentialsCommand
@@ -11,6 +11,8 @@ public class Commandkickall extends EssentialsCommand
@Override @Override
protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
{ {
String kickReason = args.length > 1 ? getFinalArg(args, 1) : _("kickDefault");
kickReason = kickReason.replace("\\n", "\n");
for (Player onlinePlayer : server.getOnlinePlayers()) for (Player onlinePlayer : server.getOnlinePlayers())
{ {
if (sender instanceof IUser && onlinePlayer.getName().equalsIgnoreCase(((Player)sender).getName())) if (sender instanceof IUser && onlinePlayer.getName().equalsIgnoreCase(((Player)sender).getName()))
@@ -19,7 +21,7 @@ public class Commandkickall extends EssentialsCommand
} }
else else
{ {
onlinePlayer.kickPlayer(args.length > 0 ? getFinalArg(args, 0) : _("kickDefault")); onlinePlayer.kickPlayer(kickReason);
} }
} }
} }

6
Essentials/src/net/ess3/commands/Commandtempban.java
View File

@@ -1,14 +1,14 @@
package net.ess3.commands; package net.ess3.commands;
import static net.ess3.I18n._;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import net.ess3.Console; import net.ess3.Console;
import static net.ess3.I18n._;
import net.ess3.api.IUser; import net.ess3.api.IUser;
import net.ess3.permissions.Permissions; import net.ess3.permissions.Permissions;
import net.ess3.user.Ban; import net.ess3.user.Ban;
import net.ess3.user.UserData; import net.ess3.user.UserData;
import net.ess3.utils.DateUtil; import net.ess3.utils.DateUtil;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
public class Commandtempban extends EssentialsCommand public class Commandtempban extends EssentialsCommand

16
Essentials/src/net/ess3/listener/EssentialsPlayerListener.java
View File

@@ -31,8 +31,10 @@ import net.ess3.api.IUserMap;
import net.ess3.permissions.Permissions; import net.ess3.permissions.Permissions;
import net.ess3.settings.Commands; import net.ess3.settings.Commands;
import net.ess3.user.UserData.TimestampType; import net.ess3.user.UserData.TimestampType;
import net.ess3.utils.DateUtil;
import net.ess3.utils.FormatUtil; import net.ess3.utils.FormatUtil;
import net.ess3.utils.LocationUtil; import net.ess3.utils.LocationUtil;
import net.ess3.utils.Util;
import net.ess3.utils.textreader.*; import net.ess3.utils.textreader.*;
@@ -376,9 +378,17 @@ public class EssentialsPlayerListener implements Listener
if (!banExpired && (user.isBanned() || event.getResult() == Result.KICK_BANNED)) if (!banExpired && (user.isBanned() || event.getResult() == Result.KICK_BANNED))
{ {
final String banReason = user.getData().getBan() == null ? "" : user.getData().getBan().getReason(); String banReason = user.getData().getBan().getReason();
event.disallow( if (banReason == null || banReason.isEmpty() || banReason.equalsIgnoreCase("ban"))
Result.KICK_BANNED, banReason == null || banReason.isEmpty() || banReason.equalsIgnoreCase("ban") ? _("defaultBanReason") : banReason); {
banReason = _("defaultBanReason");
}
if (user.getData().getBan().getTimeout() > 0)
{
//TODO: TL This
banReason += "\n\n" + "Expires in " + DateUtil.formatDateDiff(user.getData().getBan().getTimeout());
}
event.disallow(Result.KICK_BANNED, banReason);
return; return;
} }