SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Disband exploit fixed

Browse Source
This commit is contained in:
ProSavage 2018-10-01 16:53:10 -05:00
parent 12caa1b9d4
commit f1a42749da
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/massivecraft/factions/cmd/CmdDisband.java
View File

@ -45,13 +45,15 @@ public class CmdDisband extends FCommand {
boolean isMyFaction = fme != null && faction == myFaction; boolean isMyFaction = fme != null && faction == myFaction;
if (!fme.isAdminBypassing() && isMyFaction) {
Access access = myFaction.getAccess(fme, PermissableAction.DISBAND); if (!fme.isAdminBypassing()) {
if (access != Access.ALLOW && fme.getRole() != Role.ADMIN) { Access access = faction.getAccess(fme, PermissableAction.DISBAND);
fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "disband faction"); if (access != Access.ALLOW || fme.getRole() != Role.ADMIN) {
fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "disband " + faction.getTag());
return; return;
} }
} }
if (!faction.isNormal()) { if (!faction.isNormal()) {
msg(TL.COMMAND_DISBAND_IMMUTABLE.toString()); msg(TL.COMMAND_DISBAND_IMMUTABLE.toString());
return; return;
@ -64,7 +66,7 @@ public class CmdDisband extends FCommand {
// check for tnt before disbanding. // check for tnt before disbanding.
if (!disbandMap.containsKey(me.getUniqueId().toString()) && faction.getTnt() > 0 && isMyFaction) { if (!disbandMap.containsKey(me.getUniqueId().toString()) && faction.getTnt() > 0) {
msg(TL.COMMAND_DISBAND_CONFIRM.toString().replace("{tnt}", faction.getTnt() + "")); msg(TL.COMMAND_DISBAND_CONFIRM.toString().replace("{tnt}", faction.getTnt() + ""));
disbandMap.put(me.getUniqueId().toString(), faction.getId()); disbandMap.put(me.getUniqueId().toString(), faction.getId());
Bukkit.getScheduler().scheduleSyncDelayedTask(P.p, new Runnable() { Bukkit.getScheduler().scheduleSyncDelayedTask(P.p, new Runnable() {

1
src/main/java/com/massivecraft/factions/cmd/CmdPower.java
View File

@ -41,6 +41,7 @@ public class CmdPower extends FCommand {
return; return;
} }
double powerBoost = target.getPowerBoost(); double powerBoost = target.getPowerBoost();
String boost = (powerBoost == 0.0) ? "" : (powerBoost > 0.0 ? TL.COMMAND_POWER_BONUS.toString() : TL.COMMAND_POWER_PENALTY.toString()) + powerBoost + ")"; String boost = (powerBoost == 0.0) ? "" : (powerBoost > 0.0 ? TL.COMMAND_POWER_BONUS.toString() : TL.COMMAND_POWER_PENALTY.toString()) + powerBoost + ")";
msg(TL.COMMAND_POWER_POWER, target.describeTo(fme, true), target.getPowerRounded(), target.getPowerMaxRounded(), boost); msg(TL.COMMAND_POWER_POWER, target.describeTo(fme, true), target.getPowerRounded(), target.getPowerMaxRounded(), boost);

2
src/main/java/com/massivecraft/factions/zcore/util/TL.java
View File

@ -806,7 +806,7 @@ public enum TL {
GENERIC_YOU("you"), GENERIC_YOU("you"),
GENERIC_YOURFACTION("your faction"), GENERIC_YOURFACTION("your faction"),
GENERIC_NOPERMISSION("<b>You don't have permission to %1$s."), GENERIC_NOPERMISSION("<b>You don't have permission to %1$s."),
GENERIC_FPERM_NOPERMISSION("&7Your faction leader does not allow you to %1$s."), GENERIC_FPERM_NOPERMISSION("&7The faction leader does not allow you to &c%1$s."),
GENERIC_DOTHAT("do that"), //Ugh nuke this from high orbit GENERIC_DOTHAT("do that"), //Ugh nuke this from high orbit
GENERIC_NOPLAYERMATCH("<b>No player match found for \"<p>%1$s<b>\"."), GENERIC_NOPLAYERMATCH("<b>No player match found for \"<p>%1$s<b>\"."),
GENERIC_NOPLAYERFOUND("<b>No player \"<p>%1$s<b>\" could not be found."), GENERIC_NOPLAYERFOUND("<b>No player \"<p>%1$s<b>\" could not be found."),