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

Fly Fixes

Browse Source
This commit is contained in:
Driftay
2019-05-23 17:08:18 -04:00
parent 8770ea0d4f
commit e3cfb575fd
3 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,10 +92,10 @@ public class CmdFly extends FCommand {
continue;
}
Player player = Bukkit.getPlayer(name);
if (player == null
|| !player.isFlying()
|| player.getGameMode() == GameMode.CREATIVE
|| !SavageFactions.plugin.mc17 && player.getGameMode() == GameMode.SPECTATOR) {
if (player == null
|| !player.isFlying()
|| player.getGameMode() == GameMode.CREATIVE
|| !SavageFactions.plugin.mc17 && player.getGameMode() == GameMode.SPECTATOR) {
continue;
}
FPlayer fPlayer = FPlayers.getInstance().getByPlayer(player);
@@ -110,7 +110,7 @@ public class CmdFly extends FCommand {
}
FLocation myFloc = new FLocation(player.getLocation());
if (Board.getInstance().getFactionAt(myFloc) != myFaction) {
if (!checkBypassPerms(fPlayer, player, Board.getInstance().getFactionAt(myFloc))) {
if (!checkBypassPerms(fPlayer, player, Board.getInstance().getFactionAt(myFloc))) {
fPlayer.setFlying(false);
flyMap.remove(name);
}
@@ -153,8 +153,8 @@ public class CmdFly extends FCommand {
public static Boolean isSystemFaction(Faction faction) {
return faction.isSafeZone() ||
faction.isWarZone() ||
faction.isWilderness();
faction.isWarZone() ||
faction.isWilderness();
}
public static void checkTaskState() {
@@ -192,6 +192,7 @@ public class CmdFly extends FCommand {
}
}
if (args.size() == 0) {
toggleFlight(fme.isFlying(), me);
} else if (args.size() == 1) {
@@ -226,4 +227,4 @@ public class CmdFly extends FCommand {
return TL.COMMAND_FLY_DESCRIPTION;
}
}
}