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

Fixed spacing in code around ! operator.

Browse Source
This commit is contained in:
ProSavage
2018-11-07 10:14:42 -06:00
parent 7f1785e152
commit 84f1d354eb
119 changed files with 619 additions and 619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,7 +39,7 @@ public class CmdFly extends FCommand {
public static void startParticles() {
// Just a secondary check.
if (! SavageFactions.plugin.getConfig().getBoolean("ffly.Particles.Enabled")) {
if (!SavageFactions.plugin.getConfig().getBoolean("ffly.Particles.Enabled")) {
return;
}
@@ -51,10 +51,10 @@ public class CmdFly extends FCommand {
if (player == null) {
continue;
}
if (! player.isFlying()) {
if (!player.isFlying()) {
continue;
}
if (! SavageFactions.plugin.mc17) {
if (!SavageFactions.plugin.mc17) {
if (player.getGameMode() == GameMode.SPECTATOR) {
continue;
}
@@ -100,7 +100,7 @@ public class CmdFly extends FCommand {
if (player == null) {
continue;
}
if (! player.isFlying()) {
if (!player.isFlying()) {
continue;
}
FPlayer fPlayer = FPlayers.getInstance().getByPlayer(player);
@@ -110,7 +110,7 @@ public class CmdFly extends FCommand {
if (player.getGameMode() == GameMode.CREATIVE) {
continue;
}
if (! SavageFactions.plugin.mc17 && player.getGameMode() == GameMode.SPECTATOR) {
if (!SavageFactions.plugin.mc17 && player.getGameMode() == GameMode.SPECTATOR) {
continue;
}
Faction myFaction = fPlayer.getFaction();
@@ -125,7 +125,7 @@ public class CmdFly extends FCommand {
FLocation myFloc = new FLocation(player.getLocation());
Faction toFac = Board.getInstance().getFactionAt(myFloc);
if (Board.getInstance().getFactionAt(myFloc) != myFaction) {
if (! checkBypassPerms(fPlayer, player, toFac)) {
if (!checkBypassPerms(fPlayer, player, toFac)) {
fPlayer.setFlying(false);
flyMap.remove(name);
continue;
@@ -141,25 +141,25 @@ public class CmdFly extends FCommand {
private static boolean checkBypassPerms(FPlayer fme, Player me, Faction toFac) {
if (toFac != fme.getFaction()) {
if (! me.hasPermission("factions.fly.wilderness") && toFac.isWilderness() || ! me.hasPermission("factions.fly.safezone") && toFac.isSafeZone() || ! me.hasPermission("factions.fly.warzone") && toFac.isWarZone()) {
if (!me.hasPermission("factions.fly.wilderness") && toFac.isWilderness() || !me.hasPermission("factions.fly.safezone") && toFac.isSafeZone() || !me.hasPermission("factions.fly.warzone") && toFac.isWarZone()) {
fme.msg(TL.COMMAND_FLY_NO_ACCESS, toFac.getTag(fme));
return false;
}
Access access = toFac.getAccess(fme, PermissableAction.FLY);
if ((! (me.hasPermission("factions.fly.enemy") || access == Access.ALLOW)) && toFac.getRelationTo(fme.getFaction()) == Relation.ENEMY) {
if ((!(me.hasPermission("factions.fly.enemy") || access == Access.ALLOW)) && toFac.getRelationTo(fme.getFaction()) == Relation.ENEMY) {
fme.msg(TL.COMMAND_FLY_NO_ACCESS, toFac.getTag(fme));
return false;
}
if (! (me.hasPermission("factions.fly.ally") || access == Access.ALLOW) && toFac.getRelationTo(fme.getFaction()) == Relation.ALLY) {
if (!(me.hasPermission("factions.fly.ally") || access == Access.ALLOW) && toFac.getRelationTo(fme.getFaction()) == Relation.ALLY) {
fme.msg(TL.COMMAND_FLY_NO_ACCESS, toFac.getTag(fme));
return false;
}
if (! (me.hasPermission("factions.fly.truce") || access == Access.ALLOW) && toFac.getRelationTo(fme.getFaction()) == Relation.TRUCE) {
if (!(me.hasPermission("factions.fly.truce") || access == Access.ALLOW) && toFac.getRelationTo(fme.getFaction()) == Relation.TRUCE) {
fme.msg(TL.COMMAND_FLY_NO_ACCESS, toFac.getTag(fme));
return false;
}
if (! (me.hasPermission("factions.fly.neutral") || access == Access.ALLOW) && toFac.getRelationTo(fme.getFaction()) == Relation.NEUTRAL && ! isSystemFaction(toFac)) {
if (!(me.hasPermission("factions.fly.neutral") || access == Access.ALLOW) && toFac.getRelationTo(fme.getFaction()) == Relation.NEUTRAL && !isSystemFaction(toFac)) {
fme.msg(TL.COMMAND_FLY_NO_ACCESS, toFac.getTag(fme));
return false;
}
@@ -188,21 +188,21 @@ public class CmdFly extends FCommand {
@Override
public void perform() {
// Disabled by default.
if (! SavageFactions.plugin.getConfig().getBoolean("enable-faction-flight", false)) {
if (!SavageFactions.plugin.getConfig().getBoolean("enable-faction-flight", false)) {
fme.msg(TL.COMMAND_FLY_DISABLED);
return;
}
FLocation myfloc = new FLocation(me.getLocation());
Faction toFac = Board.getInstance().getFactionAt(myfloc);
if (! checkBypassPerms(fme, me, toFac)) return;
if (!checkBypassPerms(fme, me, toFac)) return;
List<Entity> entities = this.me.getNearbyEntities(16.0D, 256.0D, 16.0D);
for (int i = 0; i <= entities.size() - 1; ++ i) {
if (entities.get(i) instanceof Player) {
Player eplayer = (Player) entities.get(i);
FPlayer efplayer = FPlayers.getInstance().getByPlayer(eplayer);
if (efplayer.getRelationTo(this.fme) == Relation.ENEMY && ! efplayer.isStealthEnabled()) {
if (efplayer.getRelationTo(this.fme) == Relation.ENEMY && !efplayer.isStealthEnabled()) {
this.fme.msg(TL.COMMAND_FLY_CHECK_ENEMY);
return;
}
@@ -210,14 +210,14 @@ public class CmdFly extends FCommand {
}
if (args.size() == 0) {
toggleFlight(! fme.isFlying(), me);
toggleFlight(!fme.isFlying(), me);
} else if (args.size() == 1) {
toggleFlight(argAsBool(0), me);
}
}
private void toggleFlight(final boolean toggle, final Player player) {
if (! toggle) {
if (!toggle) {
fme.setFlying(false);
flyMap.remove(player.getName());
return;