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

Fix Bug #126

Browse Source
This commit is contained in:
Juniormunk 2020-05-21 01:58:05 -04:00
parent 1ee62c2267
commit 8ad2fdf848
2 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java
View File

@ -741,7 +741,8 @@ public class FactionsPlayerListener implements Listener {
me.attemptClaim(me.getAutoClaimFor(), newLocation, true); me.attemptClaim(me.getAutoClaimFor(), newLocation, true);
} }
FactionsPlugin.instance.logFactionEvent(me.getAutoClaimFor(), FLogType.CHUNK_CLAIMS, me.getName(), CC.GreenB + "CLAIMED", String.valueOf(1), (new FLocation(player.getLocation())).formatXAndZ(",")); FactionsPlugin.instance.logFactionEvent(me.getAutoClaimFor(), FLogType.CHUNK_CLAIMS, me.getName(), CC.GreenB + "CLAIMED", String.valueOf(1), (new FLocation(player.getLocation())).formatXAndZ(","));
if (Conf.disableFlightOnFactionClaimChange) CmdFly.disableFlight(me); if (Conf.disableFlightOnFactionClaimChange && FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight")) CmdFly.disableFlight(me);
} else if (me.isAutoSafeClaimEnabled()) { } else if (me.isAutoSafeClaimEnabled()) {
if (!Permission.MANAGE_SAFE_ZONE.has(player)) { if (!Permission.MANAGE_SAFE_ZONE.has(player)) {
me.setIsAutoSafeClaimEnabled(false); me.setIsAutoSafeClaimEnabled(false);

3
src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java
View File

@ -972,6 +972,8 @@ public abstract class MemoryFPlayer implements FPlayer {
} }
public void setFFlying(boolean fly, boolean damage) { public void setFFlying(boolean fly, boolean damage) {
if(FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight"))
{
Player player = getPlayer(); Player player = getPlayer();
if (player == null) return; if (player == null) return;
@ -1003,6 +1005,7 @@ public abstract class MemoryFPlayer implements FPlayer {
isFlying = fly; isFlying = fly;
} }
}
public boolean isInFactionsChest() { public boolean isInFactionsChest() {
return inChest; return inChest;