JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable permanent bans for hacking offenses

This commit is contained in:
AlexTheCoder 2018-01-01 02:37:38 -05:00 committed by Alexander Meech
parent 5e152e7f64
commit 738479b4ea
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Plugins/Mineplex.Core/src/mineplex/core/punish/Punish.java
View File

@ -82,7 +82,6 @@ public class Punish extends MiniPlugin
private void generatePermissions()
{
PermissionGroup.TRAINEE.setPermission(Perm.ALERT_PUNISHMENT, true, true);
PermissionGroup.TRAINEE.setPermission(Perm.PUNISHMENT_COMMAND, true, true);
PermissionGroup.MOD.setPermission(Perm.FULL_PUNISHMENT_ACCESS, true, true);
@ -132,7 +131,9 @@ public class Punish extends MiniPlugin
String time = UtilTime.convertString(punishment.GetRemaining(), 0, TimeUnit.FIT);
if (punishment.GetHours() == -1)
{
time = "Permanent";
}
String reason = C.cRed + C.Bold + "You are banned for " + time +
"\n" + C.cWhite + punishment.GetReason() +
@ -183,7 +184,9 @@ public class Punish extends MiniPlugin
String time = UtilTime.convertString(punishment.GetRemaining(), 0, TimeUnit.FIT);
if (punishment.GetHours() == -1)
{
time = "Permanent";
}
String reason = C.cRed + C.Bold + "You are banned for " + time +
"\n" + C.cWhite + punishment.GetReason() +

16
Plugins/Mineplex.Core/src/mineplex/core/punish/UI/PunishPage.java
View File

@ -246,9 +246,8 @@ public class PunishPage extends CraftInventoryCustom implements Listener
{
flightSeverity = 3;
}
} catch (Exception e)
{
}
catch (Exception e) {}
AddButton(41, new ShopItem(Material.INK_SACK, (byte) 1, "Severity 3", new String[]
{
@ -571,17 +570,18 @@ public class PunishPage extends CraftInventoryCustom implements Listener
}
if (severity >= 2)
{
//Permanent!
if (pastOffences.get(category).get(2) > 0)
if (pastOffences.get(category).get(2) > 1)
{
return -1;
hours = 960;
}
else
{
hours = 720;
}
hours = 720;
}
if (severity >= 3)
{
return -1;
hours = 960;
}
return hours;