mirror of
https://github.com/TotalFreedomMC/TF-EssentialsX.git
synced 2024-09-10 20:29:28 +00:00
Merge pull request #216 from chrisgward/patch-1
Add tempban limit (with override node)
This commit is contained in:
commit
258fbdb0e8
|
@ -183,4 +183,6 @@ public interface ISettings extends IConf
|
||||||
public int getMailsPerMinute();
|
public int getMailsPerMinute();
|
||||||
|
|
||||||
public void setEssentialsChatActive(boolean b);
|
public void setEssentialsChatActive(boolean b);
|
||||||
|
|
||||||
|
long getMaxTempban();
|
||||||
}
|
}
|
||||||
|
|
|
@ -986,4 +986,10 @@ public class Settings implements ISettings
|
||||||
{
|
{
|
||||||
return mailsPerMinute;
|
return mailsPerMinute;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public long getMaxTempban()
|
||||||
|
{
|
||||||
|
return config.getLong("max-tempban-time", -1);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,6 +4,8 @@ import com.earth2me.essentials.Console;
|
||||||
import static com.earth2me.essentials.I18n._;
|
import static com.earth2me.essentials.I18n._;
|
||||||
import com.earth2me.essentials.User;
|
import com.earth2me.essentials.User;
|
||||||
import com.earth2me.essentials.Util;
|
import com.earth2me.essentials.Util;
|
||||||
|
import java.util.Calendar;
|
||||||
|
import java.util.GregorianCalendar;
|
||||||
import org.bukkit.Server;
|
import org.bukkit.Server;
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
@ -35,7 +37,7 @@ public class Commandtempban extends EssentialsCommand
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (user.isAuthorized("essentials.tempban.exempt"))
|
if (user.isAuthorized("essentials.tempban.exempt") && sender instanceof Player)
|
||||||
{
|
{
|
||||||
sender.sendMessage(_("tempbanExempt"));
|
sender.sendMessage(_("tempbanExempt"));
|
||||||
return;
|
return;
|
||||||
|
@ -44,6 +46,13 @@ public class Commandtempban extends EssentialsCommand
|
||||||
final String time = getFinalArg(args, 1);
|
final String time = getFinalArg(args, 1);
|
||||||
final long banTimestamp = Util.parseDateDiff(time, true);
|
final long banTimestamp = Util.parseDateDiff(time, true);
|
||||||
|
|
||||||
|
final long max = ess.getSettings().getMaxTempban();
|
||||||
|
if(max != 0 && banTimestamp - GregorianCalendar.getInstance().getTimeInMillis() > max * 1000 && ess.getUser(sender).isAuthorized("essentials.tempban.unlimited"))
|
||||||
|
{
|
||||||
|
sender.sendMessage(_("oversizedTempban"));
|
||||||
|
throw new NoChargeException();
|
||||||
|
}
|
||||||
|
|
||||||
final String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME;
|
final String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME;
|
||||||
final String banReason = _("tempBanned", Util.formatDateDiff(banTimestamp), senderName);
|
final String banReason = _("tempBanned", Util.formatDateDiff(banTimestamp), senderName);
|
||||||
user.setBanReason(banReason);
|
user.setBanReason(banReason);
|
||||||
|
|
|
@ -351,6 +351,10 @@ sethome-multiple:
|
||||||
# Set to 0 for no timeout
|
# Set to 0 for no timeout
|
||||||
tpa-accept-cancellation: 0
|
tpa-accept-cancellation: 0
|
||||||
|
|
||||||
|
# Set the maximum time /tempban can be used for in seconds.
|
||||||
|
# Set to -1 to disable, and essentials.tempban.unlimited can be used to override.
|
||||||
|
max-tempban-time: -1
|
||||||
|
|
||||||
############################################################
|
############################################################
|
||||||
# +------------------------------------------------------+ #
|
# +------------------------------------------------------+ #
|
||||||
# | EssentialsEco | #
|
# | EssentialsEco | #
|
||||||
|
|
|
@ -466,3 +466,4 @@ teleportationEnabledFor=\u00a76Teleportation enabled for {0}
|
||||||
teleportationDisabledFor=\u00a76Teleportation disabled for {0}
|
teleportationDisabledFor=\u00a76Teleportation disabled for {0}
|
||||||
kitOnce=\u00a74You can't use that kit again.
|
kitOnce=\u00a74You can't use that kit again.
|
||||||
fullStack=\u00a74You already have a full stack
|
fullStack=\u00a74You already have a full stack
|
||||||
|
oversizedTempban=\u00a74You may not ban a player for this period of time.
|
||||||
|
|
|
@ -469,3 +469,4 @@ teleportationEnabledFor=\u00a76Teleportation enabled for {0}
|
||||||
teleportationDisabledFor=\u00a76Teleportation disabled for {0}
|
teleportationDisabledFor=\u00a76Teleportation disabled for {0}
|
||||||
kitOnce=\u00a74You can't use that kit again.
|
kitOnce=\u00a74You can't use that kit again.
|
||||||
fullStack=\u00a74You already have a full stack
|
fullStack=\u00a74You already have a full stack
|
||||||
|
oversizedTempban=\u00a74You may not ban a player for this period of time.
|
||||||
|
|
|
@ -466,3 +466,4 @@ teleportationEnabledFor=\u00a76Teleportation enabled for {0}
|
||||||
teleportationDisabledFor=\u00a76Teleportation disabled for {0}
|
teleportationDisabledFor=\u00a76Teleportation disabled for {0}
|
||||||
kitOnce=\u00a74You can't use that kit again.
|
kitOnce=\u00a74You can't use that kit again.
|
||||||
fullStack=\u00a74You already have a full stack
|
fullStack=\u00a74You already have a full stack
|
||||||
|
oversizedTempban=\u00a74You may not ban a player for this period of time.
|
||||||
|
|
|
@ -466,3 +466,4 @@ teleportationEnabledFor=\u00a76Teleportation enabled for {0}
|
||||||
teleportationDisabledFor=\u00a76Teleportation disabled for {0}
|
teleportationDisabledFor=\u00a76Teleportation disabled for {0}
|
||||||
kitOnce=\u00a74You can't use that kit again.
|
kitOnce=\u00a74You can't use that kit again.
|
||||||
fullStack=\u00a74You already have a full stack
|
fullStack=\u00a74You already have a full stack
|
||||||
|
oversizedTempban=\u00a74You may not ban a player for this period of time.
|
||||||
|
|
|
@ -466,3 +466,4 @@ teleportationEnabledFor=\u00a76Teleportation enabled for {0}
|
||||||
teleportationDisabledFor=\u00a76Teleportation disabled for {0}
|
teleportationDisabledFor=\u00a76Teleportation disabled for {0}
|
||||||
kitOnce=\u00a74You can't use that kit again.
|
kitOnce=\u00a74You can't use that kit again.
|
||||||
fullStack=\u00a74You already have a full stack
|
fullStack=\u00a74You already have a full stack
|
||||||
|
oversizedTempban=\u00a74You may not ban a player for this period of time.
|
||||||
|
|
|
@ -466,3 +466,4 @@ teleportationEnabledFor=\u00a76Teleportation enabled for {0}
|
||||||
teleportationDisabledFor=\u00a76Teleportation disabled for {0}
|
teleportationDisabledFor=\u00a76Teleportation disabled for {0}
|
||||||
kitOnce=\u00a74You can't use that kit again.
|
kitOnce=\u00a74You can't use that kit again.
|
||||||
fullStack=\u00a74You already have a full stack
|
fullStack=\u00a74You already have a full stack
|
||||||
|
oversizedTempban=\u00a74You may not ban a player for this period of time.
|
||||||
|
|
|
@ -466,3 +466,4 @@ teleportationEnabledFor=\u00a76Teleportation enabled for {0}
|
||||||
teleportationDisabledFor=\u00a76Teleportation disabled for {0}
|
teleportationDisabledFor=\u00a76Teleportation disabled for {0}
|
||||||
kitOnce=\u00a74You can't use that kit again.
|
kitOnce=\u00a74You can't use that kit again.
|
||||||
fullStack=\u00a74You already have a full stack
|
fullStack=\u00a74You already have a full stack
|
||||||
|
oversizedTempban=\u00a74You may not ban a player for this period of time.
|
||||||
|
|
|
@ -466,3 +466,4 @@ teleportationEnabledFor=\u00a76Teleportation enabled for {0}
|
||||||
teleportationDisabledFor=\u00a76Teleportation disabled for {0}
|
teleportationDisabledFor=\u00a76Teleportation disabled for {0}
|
||||||
kitOnce=\u00a74You can't use that kit again.
|
kitOnce=\u00a74You can't use that kit again.
|
||||||
fullStack=\u00a74You already have a full stack
|
fullStack=\u00a74You already have a full stack
|
||||||
|
oversizedTempban=\u00a74You may not ban a player for this period of time.
|
||||||
|
|
|
@ -466,3 +466,4 @@ teleportationEnabledFor=\u00a76Teleportation enabled for {0}
|
||||||
teleportationDisabledFor=\u00a76Teleportation disabled for {0}
|
teleportationDisabledFor=\u00a76Teleportation disabled for {0}
|
||||||
kitOnce=\u00a74You can't use that kit again.
|
kitOnce=\u00a74You can't use that kit again.
|
||||||
fullStack=\u00a74You already have a full stack
|
fullStack=\u00a74You already have a full stack
|
||||||
|
oversizedTempban=\u00a74You may not ban a player for this period of time.
|
||||||
|
|
|
@ -466,3 +466,4 @@ teleportationEnabledFor=\u00a76Teleportation enabled for {0}
|
||||||
teleportationDisabledFor=\u00a76Teleportation disabled for {0}
|
teleportationDisabledFor=\u00a76Teleportation disabled for {0}
|
||||||
kitOnce=\u00a74You can't use that kit again.
|
kitOnce=\u00a74You can't use that kit again.
|
||||||
fullStack=\u00a74You already have a full stack
|
fullStack=\u00a74You already have a full stack
|
||||||
|
oversizedTempban=\u00a74You may not ban a player for this period of time.
|
||||||
|
|
|
@ -466,3 +466,4 @@ teleportationEnabledFor=\u00a76Teleportation enabled for {0}
|
||||||
teleportationDisabledFor=\u00a76Teleportation disabled for {0}
|
teleportationDisabledFor=\u00a76Teleportation disabled for {0}
|
||||||
kitOnce=\u00a74You can't use that kit again.
|
kitOnce=\u00a74You can't use that kit again.
|
||||||
fullStack=\u00a74You already have a full stack
|
fullStack=\u00a74You already have a full stack
|
||||||
|
oversizedTempban=\u00a74You may not ban a player for this period of time.
|
||||||
|
|
|
@ -466,3 +466,4 @@ teleportationEnabledFor=\u00a76Teleportation enabled for {0}
|
||||||
teleportationDisabledFor=\u00a76Teleportation disabled for {0}
|
teleportationDisabledFor=\u00a76Teleportation disabled for {0}
|
||||||
kitOnce=\u00a74You can't use that kit again.
|
kitOnce=\u00a74You can't use that kit again.
|
||||||
fullStack=\u00a74You already have a full stack
|
fullStack=\u00a74You already have a full stack
|
||||||
|
oversizedTempban=\u00a74You may not ban a player for this period of time.
|
||||||
|
|
|
@ -466,3 +466,4 @@ teleportationEnabledFor=\u00a76Teleportation enabled for {0}
|
||||||
teleportationDisabledFor=\u00a76Teleportation disabled for {0}
|
teleportationDisabledFor=\u00a76Teleportation disabled for {0}
|
||||||
kitOnce=\u00a74You can't use that kit again.
|
kitOnce=\u00a74You can't use that kit again.
|
||||||
fullStack=\u00a74You already have a full stack
|
fullStack=\u00a74You already have a full stack
|
||||||
|
oversizedTempban=\u00a74You may not ban a player for this period of time.
|
||||||
|
|
Loading…
Reference in a new issue