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

intellij autofixes!

Browse Source
This commit is contained in:
Henry Ammermann
2014-07-01 23:37:42 -07:00
parent 95899e7ab9
commit 97bc72e4f8
5 changed files with 18 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/massivecraft/factions/FPlayer.java
View File

@@ -209,7 +209,7 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator {
this.autoClaimFor = null;
this.autoSafeZoneEnabled = false;
this.autoWarZoneEnabled = false;
this.loginPvpDisabled = (Conf.noPVPDamageToOthersForXSecondsAfterLogin > 0) ? true : false;
this.loginPvpDisabled = Conf.noPVPDamageToOthersForXSecondsAfterLogin > 0;
this.deleteMe = false;
this.powerBoost = 0.0;
@@ -634,15 +634,7 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator {
}
public boolean canClaimForFaction(Faction forFaction) {
if (forFaction.isNone()) {
return false;
}
if (this.isAdminBypassing() || (forFaction == this.getFaction() && this.getRole().isAtLeast(Role.MODERATOR)) || (forFaction.isSafeZone() && Permission.MANAGE_SAFE_ZONE.has(getPlayer())) || (forFaction.isWarZone() && Permission.MANAGE_WAR_ZONE.has(getPlayer()))) {
return true;
}
return false;
return !forFaction.isNone() && (this.isAdminBypassing() || (forFaction == this.getFaction() && this.getRole().isAtLeast(Role.MODERATOR)) || (forFaction.isSafeZone() && Permission.MANAGE_SAFE_ZONE.has(getPlayer())) || (forFaction.isWarZone() && Permission.MANAGE_WAR_ZONE.has(getPlayer())));
}
public boolean canClaimForFactionAtLocation(Faction forFaction, Location location, boolean notifyFailure) {