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

SyncSaving and Persistence with Unclaiming and Disbanding With Fly Checks

Browse Source
This commit is contained in:
Driftay
2019-11-21 09:38:15 -05:00
parent 4f6329996f
commit 0b127cbe72
12 changed files with 45 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/massivecraft/factions/cmd/CmdAdmin.java
View File

@@ -25,6 +25,10 @@ public class CmdAdmin extends FCommand {
@Override
public void perform(CommandContext context) {
if (context.player == null) {
context.msg(TL.GENERIC_PLAYERONLY);
return;
}
// Allows admins bypass this.
if (!context.fPlayer.isAdminBypassing() && !context.fPlayer.getRole().equals(Role.LEADER)) {
context.msg(TL.COMMAND_ADMIN_NOTADMIN);

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

@@ -78,18 +78,23 @@ public class CmdDisband extends FCommand {
if (FactionsPlugin.getInstance().getConfig().getBoolean("faction-disband-broadcast", true)) {
for (FPlayer follower : FPlayers.getInstance().getOnlinePlayers()) {
String amountString = context.sender instanceof ConsoleCommandSender ? TL.GENERIC_SERVERADMIN.toString() : context.fPlayer.describeTo(follower);
UtilFly.checkFly(context.fPlayer, Board.getInstance().getFactionAt(new FLocation(follower)));
if (follower.getFaction() == faction) {
follower.msg(TL.COMMAND_DISBAND_BROADCAST_YOURS, amountString);
if (!follower.canFlyAtLocation()) {
follower.setFFlying(false, false);
}
} else {
follower.msg(TL.COMMAND_DISBAND_BROADCAST_NOTYOURS, amountString, faction.getTag(follower));
}
}
faction.disband(context.player, PlayerDisbandReason.COMMAND);
context.fPlayer.setFFlying(false, false);
} else {
faction.disband(context.player, PlayerDisbandReason.COMMAND);
context.player.sendMessage(String.valueOf(TL.COMMAND_DISBAND_PLAYER));
}
faction.disband(context.player, PlayerDisbandReason.COMMAND);
if (!context.fPlayer.canFlyAtLocation()) {
context.fPlayer.setFFlying(false, false);
}
}
}

9
src/main/java/com/massivecraft/factions/cmd/CmdFly.java
View File

@@ -116,20 +116,15 @@ public class CmdFly extends FCommand {
return false;
}
if (!(me.hasPermission(Permission.FLY_NEUTRAL.node) || access == Access.ALLOW) && toFac.getRelationTo(fme.getFaction()) == Relation.NEUTRAL && !isSystemFaction(toFac)) {
if (!(me.hasPermission(Permission.FLY_NEUTRAL.node) || access == Access.ALLOW) && toFac.getRelationTo(fme.getFaction()) == Relation.NEUTRAL && !toFac.isSystemFaction()) {
fme.msg(TL.COMMAND_FLY_NO_ACCESS, toFac.getTag(fme));
return false;
}
return me.hasPermission(Permission.FLY.node) && (access != Access.DENY || toFac.isSystemFaction());
}
return true;
return fme.canFlyAtLocation();
}
public static Boolean isSystemFaction(Faction faction) {
return faction.isSafeZone() ||
faction.isWarZone() ||
faction.isWilderness();
}
public static void checkTaskState() {
if (flyMap.isEmpty()) {

3
src/main/java/com/massivecraft/factions/cmd/CommandRequirements.java
View File

@@ -52,6 +52,9 @@ public class CommandRequirements {
return false;
}
if (context.fPlayer.isAdminBypassing()) return true;
if (!FactionsPlugin.getInstance().perm.has(context.sender, permission.node, informIfNot)) return false;
// Permissable Action provided compute that before role

4
src/main/java/com/massivecraft/factions/cmd/claim/CmdUnclaim.java
View File

@@ -54,7 +54,9 @@ public class CmdUnclaim extends FCommand {
if (radius == 1) {
// single chunk
unClaim(new FLocation(context.player), context);
boolean didUnClaim = unClaim(new FLocation(context.player), context);
if (didUnClaim && !context.fPlayer.canFlyAtLocation())
context.fPlayer.setFFlying(false, false);
} else {
// radius claim
if (!Permission.CLAIM_RADIUS.has(context.sender, false)) {