Fixed spacing in code around ! operator.

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

View File

@ -377,7 +377,7 @@ public class Conf {
territoryDenyUseageMaterials.add(MultiversionMaterials.JUNGLE_BUTTON.parseMaterial()); territoryDenyUseageMaterials.add(MultiversionMaterials.JUNGLE_BUTTON.parseMaterial());
territoryDenyUseageMaterials.add(MultiversionMaterials.OAK_BUTTON.parseMaterial()); territoryDenyUseageMaterials.add(MultiversionMaterials.OAK_BUTTON.parseMaterial());
territoryDenyUseageMaterials.add(MultiversionMaterials.STONE_BUTTON.parseMaterial()); territoryDenyUseageMaterials.add(MultiversionMaterials.STONE_BUTTON.parseMaterial());
if (! SavageFactions.plugin.mc17) { if (!SavageFactions.plugin.mc17) {
territoryDenyUseageMaterials.add(Material.ARMOR_STAND); territoryDenyUseageMaterials.add(Material.ARMOR_STAND);
} }
@ -413,7 +413,7 @@ public class Conf {
territoryDenyUseageMaterialsWhenOffline.add(MultiversionMaterials.JUNGLE_BUTTON.parseMaterial()); territoryDenyUseageMaterialsWhenOffline.add(MultiversionMaterials.JUNGLE_BUTTON.parseMaterial());
territoryDenyUseageMaterialsWhenOffline.add(MultiversionMaterials.OAK_BUTTON.parseMaterial()); territoryDenyUseageMaterialsWhenOffline.add(MultiversionMaterials.OAK_BUTTON.parseMaterial());
territoryDenyUseageMaterialsWhenOffline.add(MultiversionMaterials.STONE_BUTTON.parseMaterial()); territoryDenyUseageMaterialsWhenOffline.add(MultiversionMaterials.STONE_BUTTON.parseMaterial());
if (! SavageFactions.plugin.mc17) { if (!SavageFactions.plugin.mc17) {
territoryDenyUseageMaterialsWhenOffline.add(Material.ARMOR_STAND); territoryDenyUseageMaterialsWhenOffline.add(Material.ARMOR_STAND);
} }
safeZoneNerfedCreatureTypes.add(EntityType.BLAZE); safeZoneNerfedCreatureTypes.add(EntityType.BLAZE);

View File

@ -191,7 +191,7 @@ public class FLocation implements Serializable {
* @return whether this location is outside of the border * @return whether this location is outside of the border
*/ */
public boolean isOutsideWorldBorder(int buffer) { public boolean isOutsideWorldBorder(int buffer) {
if (! worldBorderSupport) { if (!worldBorderSupport) {
return false; return false;
} }
@ -247,7 +247,7 @@ public class FLocation implements Serializable {
if (obj == this) { if (obj == this) {
return true; return true;
} }
if (! (obj instanceof FLocation)) { if (!(obj instanceof FLocation)) {
return false; return false;
} }

View File

@ -224,7 +224,7 @@ public class MassiveStats implements Listener {
} }
// and only notify operators - or players with the correct permission. // and only notify operators - or players with the correct permission.
if (! event.getPlayer().isOp() && ! event.getPlayer().hasPermission(MassiveStats.MASSIVE_UPDATE_PERMISSION)) { if (!event.getPlayer().isOp() && !event.getPlayer().hasPermission(MassiveStats.MASSIVE_UPDATE_PERMISSION)) {
return; return;
} }
@ -456,7 +456,7 @@ final class MassiveStatsDataResponse {
MassiveStatsDataResponse(boolean isUpToDate, String newVersion, String updateMessage) { MassiveStatsDataResponse(boolean isUpToDate, String newVersion, String updateMessage) {
this.isUpToDate = isUpToDate; this.isUpToDate = isUpToDate;
if (! isUpToDate) { if (!isUpToDate) {
this.newVersion = newVersion; this.newVersion = newVersion;
this.updateMessage = updateMessage; this.updateMessage = updateMessage;
return; return;

View File

@ -145,7 +145,7 @@ public class SavageFactions extends MPlugin {
setupMultiversionMaterials(); setupMultiversionMaterials();
log("==== End Setup ===="); log("==== End Setup ====");
if (! preEnable()) { if (!preEnable()) {
return; return;
} }
this.loadSuccessful = false; this.loadSuccessful = false;
@ -256,7 +256,7 @@ public class SavageFactions extends MPlugin {
FIREBALL = Material.valueOf("LEGACY_FIREBALL"); FIREBALL = Material.valueOf("LEGACY_FIREBALL");
} else { } else {
if (! mc17) { if (!mc17) {
BANNER = Material.valueOf("BANNER"); BANNER = Material.valueOf("BANNER");
} }
CROPS = Material.valueOf("CROPS"); CROPS = Material.valueOf("CROPS");
@ -420,7 +420,7 @@ public class SavageFactions extends MPlugin {
public void startAutoLeaveTask(boolean restartIfRunning) { public void startAutoLeaveTask(boolean restartIfRunning) {
if (AutoLeaveTask != null) { if (AutoLeaveTask != null) {
if (! restartIfRunning) { if (!restartIfRunning) {
return; return;
} }
this.getServer().getScheduler().cancelTask(AutoLeaveTask); this.getServer().getScheduler().cancelTask(AutoLeaveTask);
@ -540,7 +540,7 @@ public class SavageFactions extends MPlugin {
// TODO: GET THIS BACK AND WORKING // TODO: GET THIS BACK AND WORKING
public boolean isFactionsCommand(String check) { public boolean isFactionsCommand(String check) {
return ! (check == null || check.isEmpty()) && this.handleCommand(null, check, true); return !(check == null || check.isEmpty()) && this.handleCommand(null, check, true);
} }
// Get a player's faction tag (faction name), mainly for usage by chat plugins for local/channel chat // Get a player's faction tag (faction name), mainly for usage by chat plugins for local/channel chat
@ -562,7 +562,7 @@ public class SavageFactions extends MPlugin {
} }
// if listener isn't set, or config option is disabled, give back uncolored tag // if listener isn't set, or config option is disabled, give back uncolored tag
if (listener == null || ! Conf.chatTagRelationColored) { if (listener == null || !Conf.chatTagRelationColored) {
tag = me.getChatTag().trim(); tag = me.getChatTag().trim();
} else { } else {
FPlayer you = FPlayers.getInstance().getByPlayer(listener); FPlayer you = FPlayers.getInstance().getByPlayer(listener);
@ -641,7 +641,7 @@ public class SavageFactions extends MPlugin {
} }
public String getPrimaryGroup(OfflinePlayer player) { public String getPrimaryGroup(OfflinePlayer player) {
return perms == null || ! perms.hasGroupSupport() ? " " : perms.getPrimaryGroup(Bukkit.getWorlds().get(0).toString(), player); return perms == null || !perms.hasGroupSupport() ? " " : perms.getPrimaryGroup(Bukkit.getWorlds().get(0).toString(), player);
} }
public void debug(Level level, String s) { public void debug(Level level, String s) {

View File

@ -40,17 +40,17 @@ public class CmdAdmin extends FCommand {
boolean permAny = Permission.ADMIN_ANY.has(sender, false); boolean permAny = Permission.ADMIN_ANY.has(sender, false);
Faction targetFaction = fyou.getFaction(); Faction targetFaction = fyou.getFaction();
if (targetFaction != myFaction && ! permAny) { if (targetFaction != myFaction && !permAny) {
msg(TL.COMMAND_ADMIN_NOTMEMBER, fyou.describeTo(fme, true)); msg(TL.COMMAND_ADMIN_NOTMEMBER, fyou.describeTo(fme, true));
return; return;
} }
if (fme != null && fme.getRole() != Role.LEADER && ! permAny) { if (fme != null && fme.getRole() != Role.LEADER && !permAny) {
msg(TL.COMMAND_ADMIN_NOTADMIN); msg(TL.COMMAND_ADMIN_NOTADMIN);
return; return;
} }
if (fyou == fme && ! permAny) { if (fyou == fme && !permAny) {
msg(TL.COMMAND_ADMIN_TARGETSELF); msg(TL.COMMAND_ADMIN_TARGETSELF);
return; return;
} }

View File

@ -32,7 +32,7 @@ public class CmdAutoClaim extends FCommand {
return; return;
} }
if (! fme.canClaimForFaction(forFaction)) { if (!fme.canClaimForFaction(forFaction)) {
if (myFaction == forFaction) { if (myFaction == forFaction) {
msg(TL.COMMAND_AUTOCLAIM_REQUIREDRANK, Role.MODERATOR.getTranslation()); msg(TL.COMMAND_AUTOCLAIM_REQUIREDRANK, Role.MODERATOR.getTranslation());
} else { } else {

View File

@ -35,7 +35,7 @@ public class CmdBan extends FCommand {
public void perform() { public void perform() {
// Adds bypass to admins and clean permission check // Adds bypass to admins and clean permission check
if (! fme.isAdminBypassing()) { if (!fme.isAdminBypassing()) {
Access access = myFaction.getAccess(fme, PermissableAction.BAN); Access access = myFaction.getAccess(fme, PermissableAction.BAN);
if (access != Access.ALLOW && fme.getRole() != Role.LEADER) { if (access != Access.ALLOW && fme.getRole() != Role.LEADER) {
fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "ban"); fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "ban");

View File

@ -33,7 +33,7 @@ public class CmdBanlist extends FCommand {
@Override @Override
public void perform() { public void perform() {
Faction target = myFaction; Faction target = myFaction;
if (! args.isEmpty()) { if (!args.isEmpty()) {
target = argAsFaction(0); target = argAsFaction(0);
} }

View File

@ -31,11 +31,11 @@ public class CmdBanner extends FCommand {
@Override @Override
public void perform() { public void perform() {
if (! SavageFactions.plugin.getConfig().getBoolean("fbanners.Enabled")) { if (!SavageFactions.plugin.getConfig().getBoolean("fbanners.Enabled")) {
msg(TL.COMMAND_BANNER_DISABLED); msg(TL.COMMAND_BANNER_DISABLED);
return; return;
} }
if (! fme.hasMoney(SavageFactions.plugin.getConfig().getInt("fbanners.Banner-Cost", 5000))) { if (!fme.hasMoney(SavageFactions.plugin.getConfig().getInt("fbanners.Banner-Cost", 5000))) {
msg(TL.COMMAND_BANNER_NOTENOUGHMONEY); msg(TL.COMMAND_BANNER_NOTENOUGHMONEY);
return; return;
} }

View File

@ -27,17 +27,17 @@ public class CmdBoom extends FCommand {
@Override @Override
public void perform() { public void perform() {
if (! myFaction.isPeaceful()) { if (!myFaction.isPeaceful()) {
fme.msg(TL.COMMAND_BOOM_PEACEFULONLY); fme.msg(TL.COMMAND_BOOM_PEACEFULONLY);
return; return;
} }
// if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
if (! payForCommand(Conf.econCostNoBoom, TL.COMMAND_BOOM_TOTOGGLE, TL.COMMAND_BOOM_FORTOGGLE)) { if (!payForCommand(Conf.econCostNoBoom, TL.COMMAND_BOOM_TOTOGGLE, TL.COMMAND_BOOM_FORTOGGLE)) {
return; return;
} }
myFaction.setPeacefulExplosionsEnabled(this.argAsBool(0, ! myFaction.getPeacefulExplosionsEnabled())); myFaction.setPeacefulExplosionsEnabled(this.argAsBool(0, !myFaction.getPeacefulExplosionsEnabled()));
String enabled = myFaction.noExplosionsInTerritory() ? TL.GENERIC_DISABLED.toString() : TL.GENERIC_ENABLED.toString(); String enabled = myFaction.noExplosionsInTerritory() ? TL.GENERIC_DISABLED.toString() : TL.GENERIC_ENABLED.toString();

View File

@ -25,7 +25,7 @@ public class CmdBypass extends FCommand {
@Override @Override
public void perform() { public void perform() {
fme.setIsAdminBypassing(this.argAsBool(0, ! fme.isAdminBypassing())); fme.setIsAdminBypassing(this.argAsBool(0, !fme.isAdminBypassing()));
// TODO: Move this to a transient field in the model?? // TODO: Move this to a transient field in the model??
if (fme.isAdminBypassing()) { if (fme.isAdminBypassing()) {

View File

@ -28,7 +28,7 @@ public class CmdChat extends FCommand {
@Override @Override
public void perform() { public void perform() {
if (! Conf.factionOnlyChat) { if (!Conf.factionOnlyChat) {
msg(TL.COMMAND_CHAT_DISABLED.toString()); msg(TL.COMMAND_CHAT_DISABLED.toString());
return; return;
} }
@ -41,7 +41,7 @@ public class CmdChat extends FCommand {
// Only allow Mods and higher rank to switch to this channel. // Only allow Mods and higher rank to switch to this channel.
if (modeString.startsWith("m") && fme.getRole().isAtLeast(Role.MODERATOR)) { if (modeString.startsWith("m") && fme.getRole().isAtLeast(Role.MODERATOR)) {
modeTarget = ChatMode.MOD; modeTarget = ChatMode.MOD;
} else if (modeString.startsWith("m") && ! fme.getRole().isAtLeast(Role.MODERATOR)) { } else if (modeString.startsWith("m") && !fme.getRole().isAtLeast(Role.MODERATOR)) {
msg(TL.COMMAND_CHAT_MOD_ONLY); msg(TL.COMMAND_CHAT_MOD_ONLY);
return; return;
} else if (modeString.startsWith("p")) { } else if (modeString.startsWith("p")) {

View File

@ -24,7 +24,7 @@ public class CmdChatSpy extends FCommand {
@Override @Override
public void perform() { public void perform() {
fme.setSpyingChat(this.argAsBool(0, ! fme.isSpyingChat())); fme.setSpyingChat(this.argAsBool(0, !fme.isSpyingChat()));
if (fme.isSpyingChat()) { if (fme.isSpyingChat()) {
fme.msg(TL.COMMAND_CHATSPY_ENABLE); fme.msg(TL.COMMAND_CHATSPY_ENABLE);

View File

@ -26,7 +26,7 @@ public class CmdCheckpoint extends FCommand {
@Override @Override
public void perform() { public void perform() {
if (! SavageFactions.plugin.getConfig().getBoolean("checkpoints.Enabled")) { if (!SavageFactions.plugin.getConfig().getBoolean("checkpoints.Enabled")) {
fme.msg(TL.COMMAND_CHECKPOINT_DISABLED); fme.msg(TL.COMMAND_CHECKPOINT_DISABLED);
return; return;
} }

View File

@ -28,12 +28,12 @@ public class CmdChest extends FCommand {
public void perform() { public void perform() {
if (! SavageFactions.plugin.getConfig().getBoolean("fchest.Enabled")) { if (!SavageFactions.plugin.getConfig().getBoolean("fchest.Enabled")) {
fme.sendMessage("This command is disabled!"); fme.sendMessage("This command is disabled!");
return; return;
} }
// This permission check is way too explicit but it's clean // This permission check is way too explicit but it's clean
if (! fme.isAdminBypassing()) { if (!fme.isAdminBypassing()) {
Access access = myFaction.getAccess(fme, PermissableAction.CHEST); Access access = myFaction.getAccess(fme, PermissableAction.CHEST);
if (access != Access.ALLOW && fme.getRole() != Role.LEADER) { if (access != Access.ALLOW && fme.getRole() != Role.LEADER) {
fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "access chest"); fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "access chest");

View File

@ -37,7 +37,7 @@ public class CmdClaim extends FCommand {
int radius = this.argAsInt(0, 1); // Default to 1 int radius = this.argAsInt(0, 1); // Default to 1
final Faction forFaction = this.argAsFaction(1, myFaction); // Default to own final Faction forFaction = this.argAsFaction(1, myFaction); // Default to own
if (! fme.isAdminBypassing()) { if (!fme.isAdminBypassing()) {
Access access = myFaction.getAccess(fme, PermissableAction.TERRITORY); Access access = myFaction.getAccess(fme, PermissableAction.TERRITORY);
if (access != Access.ALLOW && fme.getRole() != Role.LEADER) { if (access != Access.ALLOW && fme.getRole() != Role.LEADER) {
fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "change faction territory"); fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "change faction territory");
@ -56,7 +56,7 @@ public class CmdClaim extends FCommand {
fme.attemptClaim(forFaction, me.getLocation(), true); fme.attemptClaim(forFaction, me.getLocation(), true);
} else { } else {
// radius claim // radius claim
if (! Permission.CLAIM_RADIUS.has(sender, false)) { if (!Permission.CLAIM_RADIUS.has(sender, false)) {
msg(TL.COMMAND_CLAIM_DENIED); msg(TL.COMMAND_CLAIM_DENIED);
return; return;
} }

View File

@ -50,17 +50,17 @@ public class CmdColeader extends FCommand {
boolean permAny = Permission.COLEADER_ANY.has(sender, false); boolean permAny = Permission.COLEADER_ANY.has(sender, false);
Faction targetFaction = you.getFaction(); Faction targetFaction = you.getFaction();
if (targetFaction != myFaction && ! permAny) { if (targetFaction != myFaction && !permAny) {
msg(TL.COMMAND_MOD_NOTMEMBER, you.describeTo(fme, true)); msg(TL.COMMAND_MOD_NOTMEMBER, you.describeTo(fme, true));
return; return;
} }
if (fme != null && fme.getRole() != Role.LEADER && ! permAny) { if (fme != null && fme.getRole() != Role.LEADER && !permAny) {
msg(TL.COMMAND_COLEADER_NOTADMIN); msg(TL.COMMAND_COLEADER_NOTADMIN);
return; return;
} }
if (you == fme && ! permAny) { if (you == fme && !permAny) {
msg(TL.COMMAND_COLEADER_SELF); msg(TL.COMMAND_COLEADER_SELF);
return; return;
} }

View File

@ -228,7 +228,7 @@ public class CmdConfig extends FCommand {
return; return;
} }
if (! success.isEmpty()) { if (!success.isEmpty()) {
if (sender instanceof Player) { if (sender instanceof Player) {
sendMessage(success); sendMessage(success);
SavageFactions.plugin.log(success + TL.COMMAND_CONFIG_LOG.format((Player) sender)); SavageFactions.plugin.log(success + TL.COMMAND_CONFIG_LOG.format((Player) sender));

View File

@ -16,7 +16,7 @@ public class CmdConvert extends FCommand {
@Override @Override
public void perform() { public void perform() {
if (! (this.sender instanceof ConsoleCommandSender)) { if (!(this.sender instanceof ConsoleCommandSender)) {
this.sender.sendMessage(TL.GENERIC_CONSOLEONLY.toString()); this.sender.sendMessage(TL.GENERIC_CONSOLEONLY.toString());
} }
Backend nb = Backend.valueOf(this.argAsString(0).toUpperCase()); Backend nb = Backend.valueOf(this.argAsString(0).toUpperCase());

View File

@ -52,7 +52,7 @@ public class CmdCreate extends FCommand {
} }
// if economy is enabled, they're not on the bypass list, and this command has a cost set, make sure they can pay // if economy is enabled, they're not on the bypass list, and this command has a cost set, make sure they can pay
if (! canAffordCommand(Conf.econCostCreate, TL.COMMAND_CREATE_TOCREATE.toString())) { if (!canAffordCommand(Conf.econCostCreate, TL.COMMAND_CREATE_TOCREATE.toString())) {
return; return;
} }
@ -64,7 +64,7 @@ public class CmdCreate extends FCommand {
} }
// then make 'em pay (if applicable) // then make 'em pay (if applicable)
if (! payForCommand(Conf.econCostCreate, TL.COMMAND_CREATE_TOCREATE, TL.COMMAND_CREATE_FORCREATE)) { if (!payForCommand(Conf.econCostCreate, TL.COMMAND_CREATE_TOCREATE, TL.COMMAND_CREATE_FORCREATE)) {
return; return;
} }

View File

@ -34,7 +34,7 @@ public class CmdDeinvite extends FCommand {
@Override @Override
public void perform() { public void perform() {
FPlayer you = this.argAsBestFPlayerMatch(0); FPlayer you = this.argAsBestFPlayerMatch(0);
if (! fme.isAdminBypassing()) { if (!fme.isAdminBypassing()) {
Access access = myFaction.getAccess(fme, PermissableAction.INVITE); Access access = myFaction.getAccess(fme, PermissableAction.INVITE);
if (access != Access.ALLOW && fme.getRole() != Role.LEADER) { if (access != Access.ALLOW && fme.getRole() != Role.LEADER) {
fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "manage invites"); fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "manage invites");

View File

@ -23,7 +23,7 @@ public class CmdDelFWarp extends FCommand {
public void perform() { public void perform() {
String warp = argAsString(0); String warp = argAsString(0);
if (myFaction.isWarp(warp)) { if (myFaction.isWarp(warp)) {
if (! transact(fme)) { if (!transact(fme)) {
return; return;
} }
myFaction.removeWarp(warp); myFaction.removeWarp(warp);
@ -34,7 +34,7 @@ public class CmdDelFWarp extends FCommand {
} }
private boolean transact(FPlayer player) { private boolean transact(FPlayer player) {
return ! SavageFactions.plugin.getConfig().getBoolean("warp-cost.enabled", false) || player.isAdminBypassing() || payForCommand(SavageFactions.plugin.getConfig().getDouble("warp-cost.delwarp", 5), TL.COMMAND_DELFWARP_TODELETE.toString(), TL.COMMAND_DELFWARP_FORDELETE.toString()); return !SavageFactions.plugin.getConfig().getBoolean("warp-cost.enabled", false) || player.isAdminBypassing() || payForCommand(SavageFactions.plugin.getConfig().getDouble("warp-cost.delwarp", 5), TL.COMMAND_DELFWARP_TODELETE.toString(), TL.COMMAND_DELFWARP_FORDELETE.toString());
} }
@Override @Override

View File

@ -31,7 +31,7 @@ public class CmdDescription extends FCommand {
@Override @Override
public void perform() { public void perform() {
// if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
if (! payForCommand(Conf.econCostDesc, TL.COMMAND_DESCRIPTION_TOCHANGE, TL.COMMAND_DESCRIPTION_FORCHANGE)) { if (!payForCommand(Conf.econCostDesc, TL.COMMAND_DESCRIPTION_TOCHANGE, TL.COMMAND_DESCRIPTION_FORCHANGE)) {
return; return;
} }
@ -39,7 +39,7 @@ public class CmdDescription extends FCommand {
// And replace all the % because it messes with string formatting and this is easy way around that. // And replace all the % because it messes with string formatting and this is easy way around that.
myFaction.setDescription(TextUtil.implode(args, " ").replaceAll("%", "").replaceAll("(&([a-f0-9klmnor]))", "& $2")); myFaction.setDescription(TextUtil.implode(args, " ").replaceAll("%", "").replaceAll("(&([a-f0-9klmnor]))", "& $2"));
if (! Conf.broadcastDescriptionChanges) { if (!Conf.broadcastDescriptionChanges) {
fme.msg(TL.COMMAND_DESCRIPTION_CHANGED, myFaction.describeTo(fme)); fme.msg(TL.COMMAND_DESCRIPTION_CHANGED, myFaction.describeTo(fme));
fme.sendMessage(myFaction.getDescription()); fme.sendMessage(myFaction.getDescription());
return; return;

View File

@ -46,7 +46,7 @@ public class CmdDisband extends FCommand {
boolean isMyFaction = fme != null && faction == myFaction; boolean isMyFaction = fme != null && faction == myFaction;
if (! fme.isAdminBypassing()) { if (!fme.isAdminBypassing()) {
Access access = faction.getAccess(fme, PermissableAction.DISBAND); Access access = faction.getAccess(fme, PermissableAction.DISBAND);
if (fme.getRole() != Role.LEADER && access != Access.ALLOW) { if (fme.getRole() != Role.LEADER && access != Access.ALLOW) {
fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "disband " + faction.getTag()); fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "disband " + faction.getTag());
@ -66,7 +66,7 @@ public class CmdDisband extends FCommand {
// check for tnt before disbanding. // check for tnt before disbanding.
if (! disbandMap.containsKey(me.getUniqueId().toString()) && faction.getTnt() > 0) { if (!disbandMap.containsKey(me.getUniqueId().toString()) && faction.getTnt() > 0) {
msg(TL.COMMAND_DISBAND_CONFIRM.toString().replace("{tnt}", faction.getTnt() + "")); msg(TL.COMMAND_DISBAND_CONFIRM.toString().replace("{tnt}", faction.getTnt() + ""));
disbandMap.put(me.getUniqueId().toString(), faction.getId()); disbandMap.put(me.getUniqueId().toString(), faction.getId());
Bukkit.getScheduler().scheduleSyncDelayedTask(SavageFactions.plugin, new Runnable() { Bukkit.getScheduler().scheduleSyncDelayedTask(SavageFactions.plugin, new Runnable() {

View File

@ -31,7 +31,7 @@ public class CmdFWarp extends FCommand {
@Override @Override
public void perform() { public void perform() {
//TODO: check if in combat. //TODO: check if in combat.
if (! fme.isAdminBypassing()) { if (!fme.isAdminBypassing()) {
Access access = myFaction.getAccess(fme, PermissableAction.WARP); Access access = myFaction.getAccess(fme, PermissableAction.WARP);
if (access != Access.ALLOW && fme.getRole() != Role.LEADER) { if (access != Access.ALLOW && fme.getRole() != Role.LEADER) {
fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "use warps"); fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "use warps");
@ -54,13 +54,13 @@ public class CmdFWarp extends FCommand {
if (myFaction.isWarp(argAsString(0))) { if (myFaction.isWarp(argAsString(0))) {
// Check if requires password and if so, check if valid. CASE SENSITIVE // Check if requires password and if so, check if valid. CASE SENSITIVE
if (myFaction.hasWarpPassword(warpName) && ! myFaction.isWarpPassword(warpName, passwordAttempt)) { if (myFaction.hasWarpPassword(warpName) && !myFaction.isWarpPassword(warpName, passwordAttempt)) {
fme.msg(TL.COMMAND_FWARP_INVALID_PASSWORD); fme.msg(TL.COMMAND_FWARP_INVALID_PASSWORD);
return; return;
} }
// Check transaction AFTER password check. // Check transaction AFTER password check.
if (! transact(fme)) { if (!transact(fme)) {
return; return;
} }
final FPlayer fPlayer = fme; final FPlayer fPlayer = fme;
@ -82,7 +82,7 @@ public class CmdFWarp extends FCommand {
} }
private boolean transact(FPlayer player) { private boolean transact(FPlayer player) {
return ! SavageFactions.plugin.getConfig().getBoolean("warp-cost.enabled", false) || player.isAdminBypassing() || payForCommand(SavageFactions.plugin.getConfig().getDouble("warp-cost.warp", 5), TL.COMMAND_FWARP_TOWARP.toString(), TL.COMMAND_FWARP_FORWARPING.toString()); return !SavageFactions.plugin.getConfig().getBoolean("warp-cost.enabled", false) || player.isAdminBypassing() || payForCommand(SavageFactions.plugin.getConfig().getDouble("warp-cost.warp", 5), TL.COMMAND_FWARP_TOWARP.toString(), TL.COMMAND_FWARP_FORWARPING.toString());
} }
@Override @Override

View File

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

View File

@ -26,7 +26,7 @@ public class CmdGetVault extends FCommand {
@Override @Override
public void perform() { public void perform() {
if (! SavageFactions.plugin.getConfig().getBoolean("fvault.Enabled")) { if (!SavageFactions.plugin.getConfig().getBoolean("fvault.Enabled")) {
fme.sendMessage("This command is disabled!"); fme.sendMessage("This command is disabled!");
return; return;
} }
@ -43,7 +43,7 @@ public class CmdGetVault extends FCommand {
//has enough money? //has enough money?
int amount = SavageFactions.plugin.getConfig().getInt("fvault.Price"); int amount = SavageFactions.plugin.getConfig().getInt("fvault.Price");
if (! fme.hasMoney(amount)) { if (!fme.hasMoney(amount)) {
return; return;
} }

View File

@ -40,16 +40,16 @@ public class CmdHome extends FCommand {
@Override @Override
public void perform() { public void perform() {
// TODO: Hide this command on help also. // TODO: Hide this command on help also.
if (! Conf.homesEnabled) { if (!Conf.homesEnabled) {
fme.msg(TL.COMMAND_HOME_DISABLED); fme.msg(TL.COMMAND_HOME_DISABLED);
return; return;
} }
if (! Conf.homesTeleportCommandEnabled) { if (!Conf.homesTeleportCommandEnabled) {
fme.msg(TL.COMMAND_HOME_TELEPORTDISABLED); fme.msg(TL.COMMAND_HOME_TELEPORTDISABLED);
return; return;
} }
if (! fme.isAdminBypassing()) { if (!fme.isAdminBypassing()) {
Access access = myFaction.getAccess(fme, PermissableAction.HOME); Access access = myFaction.getAccess(fme, PermissableAction.HOME);
if (access != Access.ALLOW && fme.getRole() != Role.LEADER) { if (access != Access.ALLOW && fme.getRole() != Role.LEADER) {
fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "teleport home"); fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "teleport home");
@ -58,18 +58,18 @@ public class CmdHome extends FCommand {
} }
if (! myFaction.hasHome()) { if (!myFaction.hasHome()) {
fme.msg(TL.COMMAND_HOME_NOHOME.toString() + (fme.getRole().value < Role.MODERATOR.value ? TL.GENERIC_ASKYOURLEADER.toString() : TL.GENERIC_YOUSHOULD.toString())); fme.msg(TL.COMMAND_HOME_NOHOME.toString() + (fme.getRole().value < Role.MODERATOR.value ? TL.GENERIC_ASKYOURLEADER.toString() : TL.GENERIC_YOUSHOULD.toString()));
fme.sendMessage(p.cmdBase.cmdSethome.getUseageTemplate()); fme.sendMessage(p.cmdBase.cmdSethome.getUseageTemplate());
return; return;
} }
if (! Conf.homesTeleportAllowedFromEnemyTerritory && fme.isInEnemyTerritory()) { if (!Conf.homesTeleportAllowedFromEnemyTerritory && fme.isInEnemyTerritory()) {
fme.msg(TL.COMMAND_HOME_INENEMY); fme.msg(TL.COMMAND_HOME_INENEMY);
return; return;
} }
if (! Conf.homesTeleportAllowedFromDifferentWorld && me.getWorld().getUID() != myFaction.getHome().getWorld().getUID()) { if (!Conf.homesTeleportAllowedFromDifferentWorld && me.getWorld().getUID() != myFaction.getHome().getWorld().getUID()) {
fme.msg(TL.COMMAND_HOME_WRONGWORLD); fme.msg(TL.COMMAND_HOME_WRONGWORLD);
return; return;
} }
@ -79,15 +79,15 @@ public class CmdHome extends FCommand {
// if player is not in a safe zone or their own faction territory, only allow teleport if no enemies are nearby // if player is not in a safe zone or their own faction territory, only allow teleport if no enemies are nearby
if (Conf.homesTeleportAllowedEnemyDistance > 0 && if (Conf.homesTeleportAllowedEnemyDistance > 0 &&
! faction.isSafeZone() && !faction.isSafeZone() &&
(! fme.isInOwnTerritory() || (fme.isInOwnTerritory() && ! Conf.homesTeleportIgnoreEnemiesIfInOwnTerritory))) { (!fme.isInOwnTerritory() || (fme.isInOwnTerritory() && !Conf.homesTeleportIgnoreEnemiesIfInOwnTerritory))) {
World w = loc.getWorld(); World w = loc.getWorld();
double x = loc.getX(); double x = loc.getX();
double y = loc.getY(); double y = loc.getY();
double z = loc.getZ(); double z = loc.getZ();
for (Player p : me.getServer().getOnlinePlayers()) { for (Player p : me.getServer().getOnlinePlayers()) {
if (p == null || ! p.isOnline() || p.isDead() || p == me || p.getWorld() != w) { if (p == null || !p.isOnline() || p.isDead() || p == me || p.getWorld() != w) {
continue; continue;
} }
@ -113,7 +113,7 @@ public class CmdHome extends FCommand {
} }
// if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
if (! payForCommand(Conf.econCostHome, TL.COMMAND_HOME_TOTELEPORT.toString(), TL.COMMAND_HOME_FORTELEPORT.toString())) { if (!payForCommand(Conf.econCostHome, TL.COMMAND_HOME_TOTELEPORT.toString(), TL.COMMAND_HOME_FORTELEPORT.toString())) {
return; return;
} }

View File

@ -44,11 +44,11 @@ public class CmdInvite extends FCommand {
} }
// if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
if (! payForCommand(Conf.econCostInvite, TL.COMMAND_INVITE_TOINVITE.toString(), TL.COMMAND_INVITE_FORINVITE.toString())) { if (!payForCommand(Conf.econCostInvite, TL.COMMAND_INVITE_TOINVITE.toString(), TL.COMMAND_INVITE_FORINVITE.toString())) {
return; return;
} }
if (! fme.isAdminBypassing()) { if (!fme.isAdminBypassing()) {
Access access = myFaction.getAccess(fme, PermissableAction.INVITE); Access access = myFaction.getAccess(fme, PermissableAction.INVITE);
if (access != Access.ALLOW && fme.getRole() != Role.LEADER) { if (access != Access.ALLOW && fme.getRole() != Role.LEADER) {
fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "manage invites"); fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "manage invites");

View File

@ -35,12 +35,12 @@ public class CmdJoin extends FCommand {
FPlayer fplayer = this.argAsBestFPlayerMatch(1, fme, false); FPlayer fplayer = this.argAsBestFPlayerMatch(1, fme, false);
boolean samePlayer = fplayer == fme; boolean samePlayer = fplayer == fme;
if (! samePlayer && ! Permission.JOIN_OTHERS.has(sender, false)) { if (!samePlayer && !Permission.JOIN_OTHERS.has(sender, false)) {
msg(TL.COMMAND_JOIN_CANNOTFORCE); msg(TL.COMMAND_JOIN_CANNOTFORCE);
return; return;
} }
if (! faction.isNormal()) { if (!faction.isNormal()) {
msg(TL.COMMAND_JOIN_SYSTEMFACTION); msg(TL.COMMAND_JOIN_SYSTEMFACTION);
return; return;
} }
@ -62,12 +62,12 @@ public class CmdJoin extends FCommand {
return; return;
} }
if (! Conf.canLeaveWithNegativePower && fplayer.getPower() < 0) { if (!Conf.canLeaveWithNegativePower && fplayer.getPower() < 0) {
msg(TL.COMMAND_JOIN_NEGATIVEPOWER, fplayer.describeTo(fme, true)); msg(TL.COMMAND_JOIN_NEGATIVEPOWER, fplayer.describeTo(fme, true));
return; return;
} }
if (! (faction.getOpen() || faction.isInvited(fplayer) || fme.isAdminBypassing() || Permission.JOIN_ANY.has(sender, false))) { if (!(faction.getOpen() || faction.isInvited(fplayer) || fme.isAdminBypassing() || Permission.JOIN_ANY.has(sender, false))) {
msg(TL.COMMAND_JOIN_REQUIRESINVITATION); msg(TL.COMMAND_JOIN_REQUIRESINVITATION);
if (samePlayer) { if (samePlayer) {
faction.msg(TL.COMMAND_JOIN_ATTEMPTEDJOIN, fplayer.describeTo(faction, true)); faction.msg(TL.COMMAND_JOIN_ATTEMPTEDJOIN, fplayer.describeTo(faction, true));
@ -76,12 +76,12 @@ public class CmdJoin extends FCommand {
} }
// if economy is enabled, they're not on the bypass list, and this command has a cost set, make sure they can pay // if economy is enabled, they're not on the bypass list, and this command has a cost set, make sure they can pay
if (samePlayer && ! canAffordCommand(Conf.econCostJoin, TL.COMMAND_JOIN_TOJOIN.toString())) { if (samePlayer && !canAffordCommand(Conf.econCostJoin, TL.COMMAND_JOIN_TOJOIN.toString())) {
return; return;
} }
// Check for ban // Check for ban
if (! fme.isAdminBypassing() && faction.isBanned(fme)) { if (!fme.isAdminBypassing() && faction.isBanned(fme)) {
fme.msg(TL.COMMAND_JOIN_BANNED, faction.getTag(fme)); fme.msg(TL.COMMAND_JOIN_BANNED, faction.getTag(fme));
return; return;
} }
@ -94,13 +94,13 @@ public class CmdJoin extends FCommand {
} }
// then make 'em pay (if applicable) // then make 'em pay (if applicable)
if (samePlayer && ! payForCommand(Conf.econCostJoin, TL.COMMAND_JOIN_TOJOIN.toString(), TL.COMMAND_JOIN_FORJOIN.toString())) { if (samePlayer && !payForCommand(Conf.econCostJoin, TL.COMMAND_JOIN_TOJOIN.toString(), TL.COMMAND_JOIN_FORJOIN.toString())) {
return; return;
} }
fme.msg(TL.COMMAND_JOIN_SUCCESS, fplayer.describeTo(fme, true), faction.getTag(fme)); fme.msg(TL.COMMAND_JOIN_SUCCESS, fplayer.describeTo(fme, true), faction.getTag(fme));
if (! samePlayer) { if (!samePlayer) {
fplayer.msg(TL.COMMAND_JOIN_MOVED, fme.describeTo(fplayer, true), faction.getTag(fplayer)); fplayer.msg(TL.COMMAND_JOIN_MOVED, fme.describeTo(fplayer, true), faction.getTag(fplayer));
} }
faction.msg(TL.COMMAND_JOIN_JOINED, fplayer.describeTo(faction, true)); faction.msg(TL.COMMAND_JOIN_JOINED, fplayer.describeTo(faction, true));

View File

@ -78,7 +78,7 @@ public class CmdKick extends FCommand {
// - Check for the kick permission. // - Check for the kick permission.
// - Make sure the player is in the faction. // - Make sure the player is in the faction.
// - Make sure the kicked player has lower rank than the kicker. // - Make sure the kicked player has lower rank than the kicker.
if (! fme.isAdminBypassing()) { if (!fme.isAdminBypassing()) {
Access access = myFaction.getAccess(fme, PermissableAction.KICK); Access access = myFaction.getAccess(fme, PermissableAction.KICK);
if (access != Access.ALLOW && fme.getRole() != Role.LEADER) { if (access != Access.ALLOW && fme.getRole() != Role.LEADER) {
fme.msg(TL.GENERIC_NOPERMISSION, "kick"); fme.msg(TL.GENERIC_NOPERMISSION, "kick");
@ -92,14 +92,14 @@ public class CmdKick extends FCommand {
msg(TL.COMMAND_KICK_INSUFFICIENTRANK); msg(TL.COMMAND_KICK_INSUFFICIENTRANK);
return; return;
} }
if (! Conf.canLeaveWithNegativePower && toKick.getPower() < 0) { if (!Conf.canLeaveWithNegativePower && toKick.getPower() < 0) {
msg(TL.COMMAND_KICK_NEGATIVEPOWER); msg(TL.COMMAND_KICK_NEGATIVEPOWER);
return; return;
} }
} }
// if economy is enabled, they're not on the bypass list, and this command has a cost set, make sure they can pay // if economy is enabled, they're not on the bypass list, and this command has a cost set, make sure they can pay
if (! canAffordCommand(Conf.econCostKick, TL.COMMAND_KICK_TOKICK.toString())) { if (!canAffordCommand(Conf.econCostKick, TL.COMMAND_KICK_TOKICK.toString())) {
return; return;
} }
@ -111,7 +111,7 @@ public class CmdKick extends FCommand {
} }
// then make 'em pay (if applicable) // then make 'em pay (if applicable)
if (! payForCommand(Conf.econCostKick, TL.COMMAND_KICK_TOKICK.toString(), TL.COMMAND_KICK_FORKICK.toString())) { if (!payForCommand(Conf.econCostKick, TL.COMMAND_KICK_TOKICK.toString(), TL.COMMAND_KICK_FORKICK.toString())) {
return; return;
} }

View File

@ -41,7 +41,7 @@ public class CmdList extends FCommand {
@Override @Override
public void perform() { public void perform() {
// if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
if (! payForCommand(Conf.econCostList, "to list the factions", "for listing the factions")) { if (!payForCommand(Conf.econCostList, "to list the factions", "for listing the factions")) {
return; return;
} }
@ -51,7 +51,7 @@ public class CmdList extends FCommand {
factionList.remove(Factions.getInstance().getWarZone()); factionList.remove(Factions.getInstance().getWarZone());
// remove exempt factions // remove exempt factions
if (! fme.getPlayer().hasPermission("factions.show.bypassexempt")) { if (!fme.getPlayer().hasPermission("factions.show.bypassexempt")) {
List<String> exemptFactions = SavageFactions.plugin.getConfig().getStringList("show-exempt"); List<String> exemptFactions = SavageFactions.plugin.getConfig().getStringList("show-exempt");
Iterator<Faction> factionIterator = factionList.iterator(); Iterator<Faction> factionIterator = factionList.iterator();
while (factionIterator.hasNext()) { while (factionIterator.hasNext()) {

View File

@ -31,7 +31,7 @@ public class CmdLock extends FCommand {
@Override @Override
public void perform() { public void perform() {
p.setLocked(this.argAsBool(0, ! p.getLocked())); p.setLocked(this.argAsBool(0, !p.getLocked()));
msg(p.getLocked() ? TL.COMMAND_LOCK_LOCKED : TL.COMMAND_LOCK_UNLOCKED); msg(p.getLocked() ? TL.COMMAND_LOCK_LOCKED : TL.COMMAND_LOCK_UNLOCKED);
} }

View File

@ -19,8 +19,8 @@ public class CmdLogins extends FCommand {
@Override @Override
public void perform() { public void perform() {
boolean monitor = fme.isMonitoringJoins(); boolean monitor = fme.isMonitoringJoins();
fme.msg(TL.COMMAND_LOGINS_TOGGLE, String.valueOf(! monitor)); fme.msg(TL.COMMAND_LOGINS_TOGGLE, String.valueOf(!monitor));
fme.setMonitorJoins(! monitor); fme.setMonitorJoins(!monitor);
} }
@Override @Override

View File

@ -29,11 +29,11 @@ public class CmdMap extends FCommand {
@Override @Override
public void perform() { public void perform() {
if (this.argIsSet(0)) { if (this.argIsSet(0)) {
if (this.argAsBool(0, ! fme.isMapAutoUpdating())) { if (this.argAsBool(0, !fme.isMapAutoUpdating())) {
// Turn on // Turn on
// if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
if (! payForCommand(Conf.econCostMap, "to show the map", "for showing the map")) { if (!payForCommand(Conf.econCostMap, "to show the map", "for showing the map")) {
return; return;
} }
@ -49,7 +49,7 @@ public class CmdMap extends FCommand {
} }
} else { } else {
// if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
if (! payForCommand(Conf.econCostMap, TL.COMMAND_MAP_TOSHOW, TL.COMMAND_MAP_FORSHOW)) { if (!payForCommand(Conf.econCostMap, TL.COMMAND_MAP_TOSHOW, TL.COMMAND_MAP_FORSHOW)) {
return; return;
} }

View File

@ -47,17 +47,17 @@ public class CmdMod extends FCommand {
boolean permAny = Permission.MOD_ANY.has(sender, false); boolean permAny = Permission.MOD_ANY.has(sender, false);
Faction targetFaction = you.getFaction(); Faction targetFaction = you.getFaction();
if (targetFaction != myFaction && ! permAny) { if (targetFaction != myFaction && !permAny) {
msg(TL.COMMAND_MOD_NOTMEMBER, you.describeTo(fme, true)); msg(TL.COMMAND_MOD_NOTMEMBER, you.describeTo(fme, true));
return; return;
} }
if (fme != null && fme.getRole() != Role.LEADER && ! permAny) { if (fme != null && fme.getRole() != Role.LEADER && !permAny) {
msg(TL.COMMAND_MOD_NOTADMIN); msg(TL.COMMAND_MOD_NOTADMIN);
return; return;
} }
if (you == fme && ! permAny) { if (you == fme && !permAny) {
msg(TL.COMMAND_MOD_SELF); msg(TL.COMMAND_MOD_SELF);
return; return;
} }

View File

@ -34,7 +34,7 @@ public class CmdMoneyBalance extends FCommand {
if (faction == null) { if (faction == null) {
return; return;
} }
if (faction != myFaction && ! Permission.MONEY_BALANCE_ANY.has(sender, true)) { if (faction != myFaction && !Permission.MONEY_BALANCE_ANY.has(sender, true)) {
return; return;
} }

View File

@ -25,7 +25,7 @@ public class CmdNear extends FCommand {
@Override @Override
public void perform() { public void perform() {
if (! SavageFactions.plugin.getConfig().getBoolean("fnear.Enabled")) { if (!SavageFactions.plugin.getConfig().getBoolean("fnear.Enabled")) {
fme.msg(TL.COMMAND_NEAR_DISABLED_MSG); fme.msg(TL.COMMAND_NEAR_DISABLED_MSG);
return; return;
} }

View File

@ -28,11 +28,11 @@ public class CmdOpen extends FCommand {
@Override @Override
public void perform() { public void perform() {
// if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
if (! payForCommand(Conf.econCostOpen, TL.COMMAND_OPEN_TOOPEN, TL.COMMAND_OPEN_FOROPEN)) { if (!payForCommand(Conf.econCostOpen, TL.COMMAND_OPEN_TOOPEN, TL.COMMAND_OPEN_FOROPEN)) {
return; return;
} }
myFaction.setOpen(this.argAsBool(0, ! myFaction.getOpen())); myFaction.setOpen(this.argAsBool(0, !myFaction.getOpen()));
String open = myFaction.getOpen() ? TL.COMMAND_OPEN_OPEN.toString() : TL.COMMAND_OPEN_CLOSED.toString(); String open = myFaction.getOpen() ? TL.COMMAND_OPEN_OPEN.toString() : TL.COMMAND_OPEN_CLOSED.toString();

View File

@ -31,21 +31,21 @@ public class CmdOwner extends FCommand {
public void perform() { public void perform() {
boolean hasBypass = fme.isAdminBypassing(); boolean hasBypass = fme.isAdminBypassing();
if (! hasBypass && ! assertHasFaction()) { if (!hasBypass && !assertHasFaction()) {
return; return;
} }
if (! Conf.ownedAreasEnabled) { if (!Conf.ownedAreasEnabled) {
fme.msg(TL.COMMAND_OWNER_DISABLED); fme.msg(TL.COMMAND_OWNER_DISABLED);
return; return;
} }
if (! hasBypass && Conf.ownedAreasLimitPerFaction > 0 && myFaction.getCountOfClaimsWithOwners() >= Conf.ownedAreasLimitPerFaction) { if (!hasBypass && Conf.ownedAreasLimitPerFaction > 0 && myFaction.getCountOfClaimsWithOwners() >= Conf.ownedAreasLimitPerFaction) {
fme.msg(TL.COMMAND_OWNER_LIMIT, Conf.ownedAreasLimitPerFaction); fme.msg(TL.COMMAND_OWNER_LIMIT, Conf.ownedAreasLimitPerFaction);
return; return;
} }
if (! hasBypass && ! assertMinRole(Conf.ownedAreasModeratorsCanSet ? Role.MODERATOR : Role.LEADER)) { if (!hasBypass && !assertMinRole(Conf.ownedAreasModeratorsCanSet ? Role.MODERATOR : Role.LEADER)) {
return; return;
} }
@ -53,12 +53,12 @@ public class CmdOwner extends FCommand {
Faction factionHere = Board.getInstance().getFactionAt(flocation); Faction factionHere = Board.getInstance().getFactionAt(flocation);
if (factionHere != myFaction) { if (factionHere != myFaction) {
if (! factionHere.isNormal()) { if (!factionHere.isNormal()) {
fme.msg(TL.COMMAND_OWNER_NOTCLAIMED); fme.msg(TL.COMMAND_OWNER_NOTCLAIMED);
return; return;
} }
if (! hasBypass) { if (!hasBypass) {
fme.msg(TL.COMMAND_OWNER_WRONGFACTION); fme.msg(TL.COMMAND_OWNER_WRONGFACTION);
return; return;
} }
@ -91,7 +91,7 @@ public class CmdOwner extends FCommand {
} }
// if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
if (! payForCommand(Conf.econCostOwner, TL.COMMAND_OWNER_TOSET, TL.COMMAND_OWNER_FORSET)) { if (!payForCommand(Conf.econCostOwner, TL.COMMAND_OWNER_TOSET, TL.COMMAND_OWNER_FORSET)) {
return; return;
} }

View File

@ -30,11 +30,11 @@ public class CmdOwnerList extends FCommand {
public void perform() { public void perform() {
boolean hasBypass = fme.isAdminBypassing(); boolean hasBypass = fme.isAdminBypassing();
if (! hasBypass && ! assertHasFaction()) { if (!hasBypass && !assertHasFaction()) {
return; return;
} }
if (! Conf.ownedAreasEnabled) { if (!Conf.ownedAreasEnabled) {
fme.msg(TL.COMMAND_OWNERLIST_DISABLED); fme.msg(TL.COMMAND_OWNERLIST_DISABLED);
return; return;
} }
@ -42,13 +42,13 @@ public class CmdOwnerList extends FCommand {
FLocation flocation = new FLocation(fme); FLocation flocation = new FLocation(fme);
if (Board.getInstance().getFactionAt(flocation) != myFaction) { if (Board.getInstance().getFactionAt(flocation) != myFaction) {
if (! hasBypass) { if (!hasBypass) {
fme.msg(TL.COMMAND_OWNERLIST_WRONGFACTION); fme.msg(TL.COMMAND_OWNERLIST_WRONGFACTION);
return; return;
} }
//TODO: This code won't ever be called. //TODO: This code won't ever be called.
myFaction = Board.getInstance().getFactionAt(flocation); myFaction = Board.getInstance().getFactionAt(flocation);
if (! myFaction.isNormal()) { if (!myFaction.isNormal()) {
fme.msg(TL.COMMAND_OWNERLIST_NOTCLAIMED); fme.msg(TL.COMMAND_OWNERLIST_NOTCLAIMED);
return; return;
} }

View File

@ -20,14 +20,14 @@ public class CmdPaypalSee extends FCommand {
} }
public void perform() { public void perform() {
if (! SavageFactions.plugin.getConfig().getBoolean("fpaypal.Enabled")) { if (!SavageFactions.plugin.getConfig().getBoolean("fpaypal.Enabled")) {
fme.msg(TL.GENERIC_DISABLED); fme.msg(TL.GENERIC_DISABLED);
} else { } else {
Faction faction = argAsFaction(0); Faction faction = argAsFaction(0);
String paypal = argAsString(1); String paypal = argAsString(1);
if (faction != null) { if (faction != null) {
if (! faction.isWilderness() && ! faction.isSafeZone() && ! faction.isWarZone()) { if (!faction.isWilderness() && !faction.isSafeZone() && !faction.isWarZone()) {
if (faction.getPaypal() != null) { if (faction.getPaypal() != null) {
fme.msg(TL.COMMAND_PAYPALSEE_FACTION_PAYPAL.toString(), faction.getTag(), faction.getPaypal()); fme.msg(TL.COMMAND_PAYPALSEE_FACTION_PAYPAL.toString(), faction.getTag(), faction.getPaypal());
} else { } else {

View File

@ -20,7 +20,7 @@ public class CmdPaypalSet extends FCommand {
} }
public void perform() { public void perform() {
if (! SavageFactions.plugin.getConfig().getBoolean("fpaypal.Enabled")) { if (!SavageFactions.plugin.getConfig().getBoolean("fpaypal.Enabled")) {
fme.msg(TL.GENERIC_DISABLED); fme.msg(TL.GENERIC_DISABLED);
} else { } else {
String paypal = argAsString(0); String paypal = argAsString(0);

View File

@ -32,12 +32,12 @@ public class CmdPower extends FCommand {
return; return;
} }
if (target != fme && ! Permission.POWER_ANY.has(sender, true)) { if (target != fme && !Permission.POWER_ANY.has(sender, true)) {
return; return;
} }
// if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
if (! payForCommand(Conf.econCostPower, TL.COMMAND_POWER_TOSHOW, TL.COMMAND_POWER_FORSHOW)) { if (!payForCommand(Conf.econCostPower, TL.COMMAND_POWER_TOSHOW, TL.COMMAND_POWER_FORSHOW)) {
return; return;
} }

View File

@ -32,7 +32,7 @@ public class CmdPowerBoost extends FCommand {
boolean doPlayer = true; boolean doPlayer = true;
if (type.equals("f") || type.equals("faction")) { if (type.equals("f") || type.equals("faction")) {
doPlayer = false; doPlayer = false;
} else if (! type.equals("plugin") && ! type.equals("player")) { } else if (!type.equals("plugin") && !type.equals("player")) {
msg(TL.COMMAND_POWERBOOST_HELP_1); msg(TL.COMMAND_POWERBOOST_HELP_1);
msg(TL.COMMAND_POWERBOOST_HELP_2); msg(TL.COMMAND_POWERBOOST_HELP_2);
return; return;
@ -76,7 +76,7 @@ public class CmdPowerBoost extends FCommand {
int roundedPower = (int) Math.round(targetPower); int roundedPower = (int) Math.round(targetPower);
msg(TL.COMMAND_POWERBOOST_BOOST, target, roundedPower); msg(TL.COMMAND_POWERBOOST_BOOST, target, roundedPower);
if (! senderIsConsole) { if (!senderIsConsole) {
SavageFactions.plugin.log(TL.COMMAND_POWERBOOST_BOOSTLOG.toString(), fme.getName(), target, roundedPower); SavageFactions.plugin.log(TL.COMMAND_POWERBOOST_BOOSTLOG.toString(), fme.getName(), target, roundedPower);
} }
} }

View File

@ -28,7 +28,7 @@ public class CmdRules extends FCommand {
@Override @Override
public void perform() { public void perform() {
if (! SavageFactions.plugin.getConfig().getBoolean("frules.Enabled")) { if (!SavageFactions.plugin.getConfig().getBoolean("frules.Enabled")) {
fme.msg(TL.COMMAND_RULES_DISABLED_MSG); fme.msg(TL.COMMAND_RULES_DISABLED_MSG);
return; return;
} }

View File

@ -15,7 +15,7 @@ public class CmdSB extends FCommand {
@Override @Override
public void perform() { public void perform() {
boolean toggleTo = ! fme.showScoreboard(); boolean toggleTo = !fme.showScoreboard();
FScoreboard board = FScoreboard.get(fme); FScoreboard board = FScoreboard.get(fme);
if (board == null) { if (board == null) {
me.sendMessage(TL.COMMAND_TOGGLESB_DISABLED.toString()); me.sendMessage(TL.COMMAND_TOGGLESB_DISABLED.toString());

View File

@ -19,7 +19,7 @@ public class CmdSetBanner extends FCommand {
} }
public void perform() { public void perform() {
if (! me.getItemInHand().getType().toString().contains("BANNER")) { if (!me.getItemInHand().getType().toString().contains("BANNER")) {
fme.msg(TL.COMMAND_SETBANNER_NOTBANNER); fme.msg(TL.COMMAND_SETBANNER_NOTBANNER);
return; return;
} }

View File

@ -30,14 +30,14 @@ public class CmdSetFWarp extends FCommand {
@Override @Override
public void perform() { public void perform() {
if (! (fme.getRelationToLocation() == Relation.MEMBER)) { if (!(fme.getRelationToLocation() == Relation.MEMBER)) {
fme.msg(TL.COMMAND_SETFWARP_NOTCLAIMED); fme.msg(TL.COMMAND_SETFWARP_NOTCLAIMED);
return; return;
} }
// This statement allows us to check if they've specifically denied it, or default to // This statement allows us to check if they've specifically denied it, or default to
// the old setting of allowing moderators to set warps. // the old setting of allowing moderators to set warps.
if (! fme.isAdminBypassing()) { if (!fme.isAdminBypassing()) {
Access access = myFaction.getAccess(fme, PermissableAction.SETWARP); Access access = myFaction.getAccess(fme, PermissableAction.SETWARP);
if (access != Access.ALLOW && fme.getRole() != Role.LEADER) { if (access != Access.ALLOW && fme.getRole() != Role.LEADER) {
fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "set warps"); fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "set warps");
@ -52,7 +52,7 @@ public class CmdSetFWarp extends FCommand {
return; return;
} }
if (! transact(fme)) { if (!transact(fme)) {
return; return;
} }
@ -68,7 +68,7 @@ public class CmdSetFWarp extends FCommand {
} }
private boolean transact(FPlayer player) { private boolean transact(FPlayer player) {
return ! SavageFactions.plugin.getConfig().getBoolean("warp-cost.enabled", false) || player.isAdminBypassing() || payForCommand(SavageFactions.plugin.getConfig().getDouble("warp-cost.setwarp", 5), TL.COMMAND_SETFWARP_TOSET.toString(), TL.COMMAND_SETFWARP_FORSET.toString()); return !SavageFactions.plugin.getConfig().getBoolean("warp-cost.enabled", false) || player.isAdminBypassing() || payForCommand(SavageFactions.plugin.getConfig().getDouble("warp-cost.setwarp", 5), TL.COMMAND_SETFWARP_TOSET.toString(), TL.COMMAND_SETFWARP_FORSET.toString());
} }
@Override @Override

View File

@ -30,7 +30,7 @@ public class CmdSethome extends FCommand {
@Override @Override
public void perform() { public void perform() {
if (! Conf.homesEnabled) { if (!Conf.homesEnabled) {
fme.msg(TL.COMMAND_SETHOME_DISABLED); fme.msg(TL.COMMAND_SETHOME_DISABLED);
return; return;
} }
@ -40,16 +40,16 @@ public class CmdSethome extends FCommand {
return; return;
} }
if (! fme.isAdminBypassing()) { if (!fme.isAdminBypassing()) {
Access access = myFaction.getAccess(fme, PermissableAction.SETHOME); Access access = myFaction.getAccess(fme, PermissableAction.SETHOME);
if (access != Access.ALLOW && fme.getRole() != Role.LEADER && ! Permission.SETHOME_ANY.has(sender, true)) { if (access != Access.ALLOW && fme.getRole() != Role.LEADER && !Permission.SETHOME_ANY.has(sender, true)) {
fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "set home"); fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "set home");
return; return;
} }
} }
// Can the player set the faction home HERE? // Can the player set the faction home HERE?
if (! Permission.BYPASS.has(me) && if (!Permission.BYPASS.has(me) &&
Conf.homesMustBeInClaimedTerritory && Conf.homesMustBeInClaimedTerritory &&
Board.getInstance().getFactionAt(new FLocation(me)) != faction) { Board.getInstance().getFactionAt(new FLocation(me)) != faction) {
fme.msg(TL.COMMAND_SETHOME_NOTCLAIMED); fme.msg(TL.COMMAND_SETHOME_NOTCLAIMED);
@ -57,7 +57,7 @@ public class CmdSethome extends FCommand {
} }
// if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
if (! payForCommand(Conf.econCostSethome, TL.COMMAND_SETHOME_TOSET, TL.COMMAND_SETHOME_FORSET)) { if (!payForCommand(Conf.econCostSethome, TL.COMMAND_SETHOME_TOSET, TL.COMMAND_SETHOME_FORSET)) {
return; return;
} }

View File

@ -54,14 +54,14 @@ public class CmdShow extends FCommand {
return; return;
} }
if (fme != null && ! fme.getPlayer().hasPermission("factions.show.bypassexempt") if (fme != null && !fme.getPlayer().hasPermission("factions.show.bypassexempt")
&& SavageFactions.plugin.getConfig().getStringList("show-exempt").contains(faction.getTag())) { && SavageFactions.plugin.getConfig().getStringList("show-exempt").contains(faction.getTag())) {
msg(TL.COMMAND_SHOW_EXEMPT); msg(TL.COMMAND_SHOW_EXEMPT);
return; return;
} }
// if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
if (! payForCommand(Conf.econCostShow, TL.COMMAND_SHOW_TOSHOW, TL.COMMAND_SHOW_FORSHOW)) { if (!payForCommand(Conf.econCostShow, TL.COMMAND_SHOW_TOSHOW, TL.COMMAND_SHOW_FORSHOW)) {
return; return;
} }
@ -70,7 +70,7 @@ public class CmdShow extends FCommand {
show = defaults; show = defaults;
} }
if (! faction.isNormal()) { if (!faction.isNormal()) {
String tag = faction.getTag(fme); String tag = faction.getTag(fme);
// send header and that's all // send header and that's all
String header = show.get(0); String header = show.get(0);
@ -99,7 +99,7 @@ public class CmdShow extends FCommand {
} }
continue; continue;
} }
if (! parsed.contains("{notFrozen}") && ! parsed.contains("{notPermanent}")) { if (!parsed.contains("{notFrozen}") && !parsed.contains("{notPermanent}")) {
if (parsed.contains("{ig}")) { if (parsed.contains("{ig}")) {
// replaces all variables with no home TL // replaces all variables with no home TL
parsed = parsed.substring(0, parsed.indexOf("{ig}")) + TL.COMMAND_SHOW_NOHOME.toString(); parsed = parsed.substring(0, parsed.indexOf("{ig}")) + TL.COMMAND_SHOW_NOHOME.toString();

View File

@ -21,8 +21,8 @@ public class CmdStealth extends FCommand {
public void perform() { public void perform() {
Faction faction = fme.getFaction(); Faction faction = fme.getFaction();
if (faction != null && ! faction.getId().equalsIgnoreCase("0") && ! faction.getId().equalsIgnoreCase("none") && ! faction.getId().equalsIgnoreCase("safezone") && ! faction.getId().equalsIgnoreCase("warzone")) { if (faction != null && !faction.getId().equalsIgnoreCase("0") && !faction.getId().equalsIgnoreCase("none") && !faction.getId().equalsIgnoreCase("safezone") && !faction.getId().equalsIgnoreCase("warzone")) {
fme.setStealth(! fme.isStealthEnabled()); fme.setStealth(!fme.isStealthEnabled());
fme.msg(fme.isStealthEnabled() ? TL.COMMAND_STEALTH_ENABLE : TL.COMMAND_STEALTH_DISABLE); fme.msg(fme.isStealthEnabled() ? TL.COMMAND_STEALTH_ENABLE : TL.COMMAND_STEALTH_DISABLE);
} else { } else {
fme.msg(TL.COMMAND_STEALTH_MUSTBEMEMBER); fme.msg(TL.COMMAND_STEALTH_MUSTBEMEMBER);

View File

@ -18,7 +18,7 @@ public class CmdStuck extends FCommand {
super(); super();
this.aliases.add("stuck"); this.aliases.add("stuck");
this.aliases.add("halp!"); // halp! c: this.aliases.add("halp!"); // halp!c:
this.permission = Permission.STUCK.node; this.permission = Permission.STUCK.node;
this.disableOnLock = true; this.disableOnLock = true;
@ -44,7 +44,7 @@ public class CmdStuck extends FCommand {
} else { } else {
// if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
if (! payForCommand(Conf.econCostStuck, TL.COMMAND_STUCK_TOSTUCK.format(fme.getName()), TL.COMMAND_STUCK_FORSTUCK.format(fme.getName()))) { if (!payForCommand(Conf.econCostStuck, TL.COMMAND_STUCK_TOSTUCK.format(fme.getName()), TL.COMMAND_STUCK_FORSTUCK.format(fme.getName()))) {
return; return;
} }
@ -52,7 +52,7 @@ public class CmdStuck extends FCommand {
@Override @Override
public void run() { public void run() {
if (! SavageFactions.plugin.getStuckMap().containsKey(player.getUniqueId())) { if (!SavageFactions.plugin.getStuckMap().containsKey(player.getUniqueId())) {
return; return;
} }
@ -74,7 +74,7 @@ public class CmdStuck extends FCommand {
FLocation chunk = currentFLocation(); FLocation chunk = currentFLocation();
Faction faction = board.getFactionAt(chunk); Faction faction = board.getFactionAt(chunk);
int buffer = SavageFactions.plugin.getConfig().getInt("world-border.buffer", 0); int buffer = SavageFactions.plugin.getConfig().getInt("world-border.buffer", 0);
if (faction.isWilderness() && ! chunk.isOutsideWorldBorder(buffer)) { if (faction.isWilderness() && !chunk.isOutsideWorldBorder(buffer)) {
int cx = FLocation.chunkToBlock((int) chunk.getX()); int cx = FLocation.chunkToBlock((int) chunk.getX());
int cz = FLocation.chunkToBlock((int) chunk.getZ()); int cz = FLocation.chunkToBlock((int) chunk.getZ());
int y = world.getHighestBlockYAt(cx, cz); int y = world.getHighestBlockYAt(cx, cz);
@ -82,7 +82,7 @@ public class CmdStuck extends FCommand {
msg(TL.COMMAND_STUCK_TELEPORT, tp.getBlockX(), tp.getBlockY(), tp.getBlockZ()); msg(TL.COMMAND_STUCK_TELEPORT, tp.getBlockX(), tp.getBlockY(), tp.getBlockZ());
SavageFactions.plugin.getTimers().remove(player.getUniqueId()); SavageFactions.plugin.getTimers().remove(player.getUniqueId());
SavageFactions.plugin.getStuckMap().remove(player.getUniqueId()); SavageFactions.plugin.getStuckMap().remove(player.getUniqueId());
if (! Essentials.handleTeleport(player, tp)) { if (!Essentials.handleTeleport(player, tp)) {
player.teleport(tp); player.teleport(tp);
SavageFactions.plugin.debug("/f stuck used regular teleport, not essentials!"); SavageFactions.plugin.debug("/f stuck used regular teleport, not essentials!");
} }

View File

@ -33,7 +33,7 @@ public class CmdTag extends FCommand {
String tag = this.argAsString(0); String tag = this.argAsString(0);
// TODO does not first test cover selfcase? // TODO does not first test cover selfcase?
if (Factions.getInstance().isTagTaken(tag) && ! MiscUtil.getComparisonString(tag).equals(myFaction.getComparisonTag())) { if (Factions.getInstance().isTagTaken(tag) && !MiscUtil.getComparisonString(tag).equals(myFaction.getComparisonTag())) {
msg(TL.COMMAND_TAG_TAKEN); msg(TL.COMMAND_TAG_TAKEN);
return; return;
} }
@ -45,7 +45,7 @@ public class CmdTag extends FCommand {
} }
// if economy is enabled, they're not on the bypass list, and this command has a cost set, make sure they can pay // if economy is enabled, they're not on the bypass list, and this command has a cost set, make sure they can pay
if (! canAffordCommand(Conf.econCostTag, TL.COMMAND_TAG_TOCHANGE.toString())) { if (!canAffordCommand(Conf.econCostTag, TL.COMMAND_TAG_TOCHANGE.toString())) {
return; return;
} }
@ -57,7 +57,7 @@ public class CmdTag extends FCommand {
} }
// then make 'em pay (if applicable) // then make 'em pay (if applicable)
if (! payForCommand(Conf.econCostTag, TL.COMMAND_TAG_TOCHANGE, TL.COMMAND_TAG_FORCHANGE)) { if (!payForCommand(Conf.econCostTag, TL.COMMAND_TAG_TOCHANGE, TL.COMMAND_TAG_FORCHANGE)) {
return; return;
} }

View File

@ -34,12 +34,12 @@ public class CmdTitle extends FCommand {
args.remove(0); args.remove(0);
String title = TextUtil.implode(args, " "); String title = TextUtil.implode(args, " ");
if (! canIAdministerYou(fme, you)) { if (!canIAdministerYou(fme, you)) {
return; return;
} }
// if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
if (! payForCommand(Conf.econCostTitle, TL.COMMAND_TITLE_TOCHANGE, TL.COMMAND_TITLE_FORCHANGE)) { if (!payForCommand(Conf.econCostTitle, TL.COMMAND_TITLE_TOCHANGE, TL.COMMAND_TITLE_FORCHANGE)) {
return; return;
} }

View File

@ -31,12 +31,12 @@ public class CmdTnt extends FCommand {
@Override @Override
public void perform() { public void perform() {
if (! SavageFactions.plugin.getConfig().getBoolean("ftnt.Enabled")) { if (!SavageFactions.plugin.getConfig().getBoolean("ftnt.Enabled")) {
fme.msg(TL.COMMAND_TNT_DISABLED_MSG); fme.msg(TL.COMMAND_TNT_DISABLED_MSG);
return; return;
} }
if (! fme.isAdminBypassing()) { if (!fme.isAdminBypassing()) {
Access access = myFaction.getAccess(fme, PermissableAction.TNTBANK); Access access = myFaction.getAccess(fme, PermissableAction.TNTBANK);
if (access != Access.ALLOW && fme.getRole() != Role.LEADER) { if (access != Access.ALLOW && fme.getRole() != Role.LEADER) {
fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "use tnt bank"); fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "use tnt bank");
@ -105,11 +105,11 @@ public class CmdTnt extends FCommand {
} }
int fullStacks = amount / 64; int fullStacks = amount / 64;
int remainderAmt = amount % 64; int remainderAmt = amount % 64;
if ((remainderAmt == 0 && ! hasAvaliableSlot(me, fullStacks))) { if ((remainderAmt == 0 && !hasAvaliableSlot(me, fullStacks))) {
fme.msg(TL.COMMAND_TNT_WIDTHDRAW_NOTENOUGH_SPACE); fme.msg(TL.COMMAND_TNT_WIDTHDRAW_NOTENOUGH_SPACE);
return; return;
} }
if (! hasAvaliableSlot(me, fullStacks + 1)) { if (!hasAvaliableSlot(me, fullStacks + 1)) {
fme.msg(TL.COMMAND_TNT_WIDTHDRAW_NOTENOUGH_SPACE); fme.msg(TL.COMMAND_TNT_WIDTHDRAW_NOTENOUGH_SPACE);
return; return;
} }

View File

@ -34,7 +34,7 @@ public class CmdTntFill extends FCommand {
@Override @Override
public void perform() { public void perform() {
if (! fme.isAdminBypassing()) { if (!fme.isAdminBypassing()) {
Access access = myFaction.getAccess(fme, PermissableAction.TNTFILL); Access access = myFaction.getAccess(fme, PermissableAction.TNTFILL);
if (access != Access.ALLOW && fme.getRole() != Role.LEADER) { if (access != Access.ALLOW && fme.getRole() != Role.LEADER) {
fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "use tnt fill"); fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "use tnt fill");
@ -78,8 +78,8 @@ public class CmdTntFill extends FCommand {
if (canHold(dispenser, amount)) { if (canHold(dispenser, amount)) {
int fullStacks = amount / 64; int fullStacks = amount / 64;
int remainderAmt = amount % 64; int remainderAmt = amount % 64;
if (! inventoryContains(me.getInventory(), new ItemStack(Material.TNT, amount))) { if (!inventoryContains(me.getInventory(), new ItemStack(Material.TNT, amount))) {
if (! fme.getRole().isAtLeast(Role.MODERATOR)) { if (!fme.getRole().isAtLeast(Role.MODERATOR)) {
msg(TL.COMMAND_TNTFILL_NOTENOUGH); msg(TL.COMMAND_TNTFILL_NOTENOUGH);
sendMessage(TL.COMMAND_TNTFILL_SUCCESS.toString().replace("{amount}", amount + "").replace("{dispensers}", counter + "")); sendMessage(TL.COMMAND_TNTFILL_SUCCESS.toString().replace("{amount}", amount + "").replace("{dispensers}", counter + ""));
me.updateInventory(); me.updateInventory();
@ -88,7 +88,7 @@ public class CmdTntFill extends FCommand {
//msg(TL.COMMAND_TNTFILL_MOD.toString().replace("{role}",fme.getRole().nicename)); //msg(TL.COMMAND_TNTFILL_MOD.toString().replace("{role}",fme.getRole().nicename));
bankMode = true; bankMode = true;
removeFromBank(amount); removeFromBank(amount);
if (! inventoryContains(me.getInventory(), new ItemStack(Material.TNT, amount))) { if (!inventoryContains(me.getInventory(), new ItemStack(Material.TNT, amount))) {
msg(TL.COMMAND_TNTFILL_NOTENOUGH); msg(TL.COMMAND_TNTFILL_NOTENOUGH);
sendMessage(TL.COMMAND_TNTFILL_SUCCESS.toString().replace("{amount}", amount + "").replace("{dispensers}", counter + "")); sendMessage(TL.COMMAND_TNTFILL_SUCCESS.toString().replace("{amount}", amount + "").replace("{dispensers}", counter + ""));
me.updateInventory(); me.updateInventory();

View File

@ -30,7 +30,7 @@ public class CmdToggleAllianceChat extends FCommand {
@Override @Override
public void perform() { public void perform() {
if (! Conf.factionOnlyChat) { if (!Conf.factionOnlyChat) {
msg(TL.COMMAND_CHAT_DISABLED.toString()); msg(TL.COMMAND_CHAT_DISABLED.toString());
return; return;
} }
@ -38,6 +38,6 @@ public class CmdToggleAllianceChat extends FCommand {
boolean ignoring = fme.isIgnoreAllianceChat(); boolean ignoring = fme.isIgnoreAllianceChat();
msg(ignoring ? TL.COMMAND_TOGGLEALLIANCECHAT_UNIGNORE : TL.COMMAND_TOGGLEALLIANCECHAT_IGNORE); msg(ignoring ? TL.COMMAND_TOGGLEALLIANCECHAT_UNIGNORE : TL.COMMAND_TOGGLEALLIANCECHAT_IGNORE);
fme.setIgnoreAllianceChat(! ignoring); fme.setIgnoreAllianceChat(!ignoring);
} }
} }

View File

@ -25,7 +25,7 @@ public class CmdTpBanner extends FCommand {
@Override @Override
public void perform() { public void perform() {
if (! SavageFactions.plugin.getConfig().getBoolean("fbanners.Enabled")) { if (!SavageFactions.plugin.getConfig().getBoolean("fbanners.Enabled")) {
return; return;
} }

View File

@ -26,9 +26,9 @@ public class CmdUnban extends FCommand {
@Override @Override
public void perform() { public void perform() {
if (! fme.isAdminBypassing()) { if (!fme.isAdminBypassing()) {
Access access = myFaction.getAccess(fme, PermissableAction.BAN); Access access = myFaction.getAccess(fme, PermissableAction.BAN);
if (access != Access.ALLOW && fme.getRole() != Role.LEADER && ! Permission.BAN.has(sender, true)) { if (access != Access.ALLOW && fme.getRole() != Role.LEADER && !Permission.BAN.has(sender, true)) {
fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "manage bans"); fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "manage bans");
return; return;
} }
@ -40,7 +40,7 @@ public class CmdUnban extends FCommand {
return; // the above method sends a message if fails to find someone. return; // the above method sends a message if fails to find someone.
} }
if (! myFaction.isBanned(target)) { if (!myFaction.isBanned(target)) {
fme.msg(TL.COMMAND_UNBAN_NOTBANNED, target.getName()); fme.msg(TL.COMMAND_UNBAN_NOTBANNED, target.getName());
return; return;
} }

View File

@ -35,7 +35,7 @@ public class CmdUnclaim extends FCommand {
int radius = this.argAsInt(0, 1); // Default to 1 int radius = this.argAsInt(0, 1); // Default to 1
final Faction forFaction = this.argAsFaction(1, myFaction); // Default to own final Faction forFaction = this.argAsFaction(1, myFaction); // Default to own
if (! fme.isAdminBypassing()) { if (!fme.isAdminBypassing()) {
Access access = myFaction.getAccess(fme, PermissableAction.TERRITORY); Access access = myFaction.getAccess(fme, PermissableAction.TERRITORY);
if (access != Access.ALLOW && fme.getRole() != Role.LEADER) { if (access != Access.ALLOW && fme.getRole() != Role.LEADER) {
fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "manage faction territory"); fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "manage faction territory");
@ -53,7 +53,7 @@ public class CmdUnclaim extends FCommand {
unClaim(new FLocation(me)); unClaim(new FLocation(me));
} else { } else {
// radius claim // radius claim
if (! Permission.CLAIM_RADIUS.has(sender, false)) { if (!Permission.CLAIM_RADIUS.has(sender, false)) {
msg(TL.COMMAND_CLAIM_DENIED); msg(TL.COMMAND_CLAIM_DENIED);
return; return;
} }
@ -133,11 +133,11 @@ public class CmdUnclaim extends FCommand {
} }
if (! assertHasFaction()) { if (!assertHasFaction()) {
return false; return false;
} }
if (targetFaction.getAccess(fme, PermissableAction.TERRITORY) != Access.ALLOW && ! assertMinRole(Role.MODERATOR)) { if (targetFaction.getAccess(fme, PermissableAction.TERRITORY) != Access.ALLOW && !assertMinRole(Role.MODERATOR)) {
return false; return false;
} }
@ -158,11 +158,11 @@ public class CmdUnclaim extends FCommand {
double refund = Econ.calculateClaimRefund(myFaction.getLandRounded()); double refund = Econ.calculateClaimRefund(myFaction.getLandRounded());
if (Conf.bankEnabled && Conf.bankFactionPaysLandCosts) { if (Conf.bankEnabled && Conf.bankFactionPaysLandCosts) {
if (! Econ.modifyMoney(myFaction, refund, TL.COMMAND_UNCLAIM_TOUNCLAIM.toString(), TL.COMMAND_UNCLAIM_FORUNCLAIM.toString())) { if (!Econ.modifyMoney(myFaction, refund, TL.COMMAND_UNCLAIM_TOUNCLAIM.toString(), TL.COMMAND_UNCLAIM_FORUNCLAIM.toString())) {
return false; return false;
} }
} else { } else {
if (! Econ.modifyMoney(fme, refund, TL.COMMAND_UNCLAIM_TOUNCLAIM.toString(), TL.COMMAND_UNCLAIM_FORUNCLAIM.toString())) { if (!Econ.modifyMoney(fme, refund, TL.COMMAND_UNCLAIM_TOUNCLAIM.toString(), TL.COMMAND_UNCLAIM_FORUNCLAIM.toString())) {
return false; return false;
} }
} }

View File

@ -32,11 +32,11 @@ public class CmdUnclaimall extends FCommand {
if (Econ.shouldBeUsed()) { if (Econ.shouldBeUsed()) {
double refund = Econ.calculateTotalLandRefund(myFaction.getLandRounded()); double refund = Econ.calculateTotalLandRefund(myFaction.getLandRounded());
if (Conf.bankEnabled && Conf.bankFactionPaysLandCosts) { if (Conf.bankEnabled && Conf.bankFactionPaysLandCosts) {
if (! Econ.modifyMoney(myFaction, refund, TL.COMMAND_UNCLAIMALL_TOUNCLAIM.toString(), TL.COMMAND_UNCLAIMALL_FORUNCLAIM.toString())) { if (!Econ.modifyMoney(myFaction, refund, TL.COMMAND_UNCLAIMALL_TOUNCLAIM.toString(), TL.COMMAND_UNCLAIMALL_FORUNCLAIM.toString())) {
return; return;
} }
} else { } else {
if (! Econ.modifyMoney(fme, refund, TL.COMMAND_UNCLAIMALL_TOUNCLAIM.toString(), TL.COMMAND_UNCLAIMALL_FORUNCLAIM.toString())) { if (!Econ.modifyMoney(fme, refund, TL.COMMAND_UNCLAIMALL_TOUNCLAIM.toString(), TL.COMMAND_UNCLAIMALL_FORUNCLAIM.toString())) {
return; return;
} }
} }

View File

@ -25,7 +25,7 @@ public class CmdUpgrades extends FCommand {
@Override @Override
public void perform() { public void perform() {
if (! SavageFactions.plugin.getConfig().getBoolean("fupgrades.Enabled")) { if (!SavageFactions.plugin.getConfig().getBoolean("fupgrades.Enabled")) {
fme.sendMessage("This command is disabled!"); fme.sendMessage("This command is disabled!");
return; return;
} }

View File

@ -32,7 +32,7 @@ public class CmdVault extends FCommand {
@Override @Override
public void perform() { public void perform() {
if (! SavageFactions.plugin.getConfig().getBoolean("fvault.Enabled")) { if (!SavageFactions.plugin.getConfig().getBoolean("fvault.Enabled")) {
fme.sendMessage("This command is disabled!"); fme.sendMessage("This command is disabled!");
return; return;
} }

View File

@ -62,12 +62,12 @@ public abstract class FCommand extends MCommand<SavageFactions> {
return false; return false;
} }
if (this.isMoneyCommand && ! Conf.econEnabled) { if (this.isMoneyCommand && !Conf.econEnabled) {
msg("<b>Faction economy features are disabled on this server."); msg("<b>Faction economy features are disabled on this server.");
return false; return false;
} }
if (this.isMoneyCommand && ! Conf.bankEnabled) { if (this.isMoneyCommand && !Conf.bankEnabled) {
msg("<b>The faction bank system is disabled on this server."); msg("<b>The faction bank system is disabled on this server.");
return false; return false;
} }
@ -78,34 +78,34 @@ public abstract class FCommand extends MCommand<SavageFactions> {
@Override @Override
public boolean validSenderType(CommandSender sender, boolean informSenderIfNot) { public boolean validSenderType(CommandSender sender, boolean informSenderIfNot) {
boolean superValid = super.validSenderType(sender, informSenderIfNot); boolean superValid = super.validSenderType(sender, informSenderIfNot);
if (! superValid) { if (!superValid) {
return false; return false;
} }
if (! (this.senderMustBeMember || this.senderMustBeModerator || this.senderMustBeAdmin || this.senderMustBeColeader)) { if (!(this.senderMustBeMember || this.senderMustBeModerator || this.senderMustBeAdmin || this.senderMustBeColeader)) {
return true; return true;
} }
if (! (sender instanceof Player)) { if (!(sender instanceof Player)) {
return false; return false;
} }
if (! fme.hasFaction()) { if (!fme.hasFaction()) {
sender.sendMessage(p.txt.parse("<b>You are not member of any faction.")); sender.sendMessage(p.txt.parse("<b>You are not member of any faction."));
return false; return false;
} }
if (this.senderMustBeModerator && ! fme.getRole().isAtLeast(Role.MODERATOR)) { if (this.senderMustBeModerator && !fme.getRole().isAtLeast(Role.MODERATOR)) {
sender.sendMessage(p.txt.parse("<b>Only faction moderators can %s.", this.getHelpShort())); sender.sendMessage(p.txt.parse("<b>Only faction moderators can %s.", this.getHelpShort()));
return false; return false;
} }
if (this.senderMustBeColeader && ! fme.getRole().isAtLeast(Role.COLEADER)) { if (this.senderMustBeColeader && !fme.getRole().isAtLeast(Role.COLEADER)) {
sender.sendMessage(p.txt.parse("<b>Only faction coleaders can %s.", this.getHelpShort())); sender.sendMessage(p.txt.parse("<b>Only faction coleaders can %s.", this.getHelpShort()));
return false; return false;
} }
if (this.senderMustBeAdmin && ! fme.getRole().isAtLeast(Role.LEADER)) { if (this.senderMustBeAdmin && !fme.getRole().isAtLeast(Role.LEADER)) {
sender.sendMessage(p.txt.parse("<b>Only faction admins can %s.", this.getHelpShort())); sender.sendMessage(p.txt.parse("<b>Only faction admins can %s.", this.getHelpShort()));
return false; return false;
} }
@ -123,7 +123,7 @@ public abstract class FCommand extends MCommand<SavageFactions> {
return true; return true;
} }
if (! fme.hasFaction()) { if (!fme.hasFaction()) {
sendMessage("You are not member of any faction."); sendMessage("You are not member of any faction.");
return false; return false;
} }
@ -256,7 +256,7 @@ public abstract class FCommand extends MCommand<SavageFactions> {
// -------------------------------------------- // // -------------------------------------------- //
public boolean canIAdministerYou(FPlayer i, FPlayer you) { public boolean canIAdministerYou(FPlayer i, FPlayer you) {
if (! i.getFaction().equals(you.getFaction())) { if (!i.getFaction().equals(you.getFaction())) {
i.sendMessage(p.txt.parse("%s <b>is not in the same faction as you.", you.describeTo(i, true))); i.sendMessage(p.txt.parse("%s <b>is not in the same faction as you.", you.describeTo(i, true)));
return false; return false;
} }
@ -290,7 +290,7 @@ public abstract class FCommand extends MCommand<SavageFactions> {
// if economy is enabled and they're not on the bypass list, make 'em pay; returns true unless person can't afford the cost // if economy is enabled and they're not on the bypass list, make 'em pay; returns true unless person can't afford the cost
public boolean payForCommand(double cost, String toDoThis, String forDoingThis) { public boolean payForCommand(double cost, String toDoThis, String forDoingThis) {
if (! Econ.shouldBeUsed() || this.fme == null || cost == 0.0 || fme.isAdminBypassing()) { if (!Econ.shouldBeUsed() || this.fme == null || cost == 0.0 || fme.isAdminBypassing()) {
return true; return true;
} }
@ -307,7 +307,7 @@ public abstract class FCommand extends MCommand<SavageFactions> {
// like above, but just make sure they can pay; returns true unless person can't afford the cost // like above, but just make sure they can pay; returns true unless person can't afford the cost
public boolean canAffordCommand(double cost, String toDoThis) { public boolean canAffordCommand(double cost, String toDoThis) {
if (! Econ.shouldBeUsed() || this.fme == null || cost == 0.0 || fme.isAdminBypassing()) { if (!Econ.shouldBeUsed() || this.fme == null || cost == 0.0 || fme.isAdminBypassing()) {
return true; return true;
} }

View File

@ -33,7 +33,7 @@ public class FPromoteCommand extends FCommand {
return; return;
} }
if (! target.getFaction().equals(myFaction)) { if (!target.getFaction().equals(myFaction)) {
msg(TL.COMMAND_PROMOTE_WRONGFACTION, target.getName()); msg(TL.COMMAND_PROMOTE_WRONGFACTION, target.getName());
return; return;
} }
@ -42,7 +42,7 @@ public class FPromoteCommand extends FCommand {
Role promotion = Role.getRelative(current, + relative); Role promotion = Role.getRelative(current, + relative);
// Now it ain't that messy // Now it ain't that messy
if (! fme.isAdminBypassing()) { if (!fme.isAdminBypassing()) {
Access access = myFaction.getAccess(fme, PermissableAction.PROMOTE); Access access = myFaction.getAccess(fme, PermissableAction.PROMOTE);
if (access != Access.ALLOW && fme.getRole() != Role.LEADER) { if (access != Access.ALLOW && fme.getRole() != Role.LEADER) {
fme.msg(TL.GENERIC_NOPERMISSION, "manage ranks"); fme.msg(TL.GENERIC_NOPERMISSION, "manage ranks");

View File

@ -37,7 +37,7 @@ public abstract class FRelationCommand extends FCommand {
return; return;
} }
if (! them.isNormal()) { if (!them.isNormal()) {
msg(TL.COMMAND_RELATIONS_ALLTHENOPE); msg(TL.COMMAND_RELATIONS_ALLTHENOPE);
return; return;
} }
@ -64,7 +64,7 @@ public abstract class FRelationCommand extends FCommand {
} }
// if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
if (! payForCommand(targetRelation.getRelationCost(), TL.COMMAND_RELATIONS_TOMARRY, TL.COMMAND_RELATIONS_FORMARRY)) { if (!payForCommand(targetRelation.getRelationCost(), TL.COMMAND_RELATIONS_TOMARRY, TL.COMMAND_RELATIONS_FORMARRY)) {
return; return;
} }
@ -88,12 +88,12 @@ public abstract class FRelationCommand extends FCommand {
myFaction.msg(TL.COMMAND_RELATIONS_PROPOSAL_SENT, currentRelationColor + them.getTag(), "" + targetRelation.getColor() + targetRelation); myFaction.msg(TL.COMMAND_RELATIONS_PROPOSAL_SENT, currentRelationColor + them.getTag(), "" + targetRelation.getColor() + targetRelation);
} }
if (! targetRelation.isNeutral() && them.isPeaceful()) { if (!targetRelation.isNeutral() && them.isPeaceful()) {
them.msg(TL.COMMAND_RELATIONS_PEACEFUL); them.msg(TL.COMMAND_RELATIONS_PEACEFUL);
myFaction.msg(TL.COMMAND_RELATIONS_PEACEFULOTHER); myFaction.msg(TL.COMMAND_RELATIONS_PEACEFULOTHER);
} }
if (! targetRelation.isNeutral() && myFaction.isPeaceful()) { if (!targetRelation.isNeutral() && myFaction.isPeaceful()) {
them.msg(TL.COMMAND_RELATIONS_PEACEFULOTHER); them.msg(TL.COMMAND_RELATIONS_PEACEFULOTHER);
myFaction.msg(TL.COMMAND_RELATIONS_PEACEFUL); myFaction.msg(TL.COMMAND_RELATIONS_PEACEFUL);
} }

View File

@ -47,7 +47,7 @@ public class Econ {
SavageFactions.plugin.log("Economy integration through Vault plugin successful."); SavageFactions.plugin.log("Economy integration through Vault plugin successful.");
if (! Conf.econEnabled) { if (!Conf.econEnabled) {
SavageFactions.plugin.log("NOTE: Economy is disabled. You can enable it with the command: f config econEnabled true"); SavageFactions.plugin.log("NOTE: Economy is disabled. You can enable it with the command: f config econEnabled true");
} }
@ -63,7 +63,7 @@ public class Econ {
} }
public static void modifyUniverseMoney(double delta) { public static void modifyUniverseMoney(double delta) {
if (! shouldBeUsed()) { if (!shouldBeUsed()) {
return; return;
} }
@ -73,7 +73,7 @@ public class Econ {
if (Conf.econUniverseAccount.length() == 0) { if (Conf.econUniverseAccount.length() == 0) {
return; return;
} }
if (! econ.hasAccount(Conf.econUniverseAccount)) { if (!econ.hasAccount(Conf.econUniverseAccount)) {
return; return;
} }
@ -81,7 +81,7 @@ public class Econ {
} }
public static void sendBalanceInfo(FPlayer to, EconomyParticipator about) { public static void sendBalanceInfo(FPlayer to, EconomyParticipator about) {
if (! shouldBeUsed()) { if (!shouldBeUsed()) {
SavageFactions.plugin.log(Level.WARNING, "Vault does not appear to be hooked into an economy plugin."); SavageFactions.plugin.log(Level.WARNING, "Vault does not appear to be hooked into an economy plugin.");
return; return;
} }
@ -124,7 +124,7 @@ public class Econ {
return true; return true;
} }
// Otherwise you may not! ;,,; // Otherwise you may not!;,,;
i.msg("<h>%s<i> lacks permission to control <h>%s's<i> money.", i.describeTo(i, true), you.describeTo(i)); i.msg("<h>%s<i> lacks permission to control <h>%s's<i> money.", i.describeTo(i, true), you.describeTo(i));
return false; return false;
} }
@ -134,7 +134,7 @@ public class Econ {
} }
public static boolean transferMoney(EconomyParticipator invoker, EconomyParticipator from, EconomyParticipator to, double amount, boolean notify) { public static boolean transferMoney(EconomyParticipator invoker, EconomyParticipator from, EconomyParticipator to, double amount, boolean notify) {
if (! shouldBeUsed()) { if (!shouldBeUsed()) {
return false; return false;
} }
@ -148,7 +148,7 @@ public class Econ {
} }
// Check the rights // Check the rights
if (! canIControllYou(invoker, from)) { if (!canIControllYou(invoker, from)) {
return false; return false;
} }
@ -174,7 +174,7 @@ public class Econ {
} }
// Is there enough money for the transaction to happen? // Is there enough money for the transaction to happen?
if (! econ.has(fromAcc, amount)) { if (!econ.has(fromAcc, amount)) {
// There was not enough money to pay // There was not enough money to pay
if (invoker != null && notify) { if (invoker != null && notify) {
invoker.msg("<h>%s<b> can't afford to transfer <h>%s<b> to %s<b>.", from.describeTo(invoker, true), moneyString(amount), to.describeTo(invoker)); invoker.msg("<h>%s<b> can't afford to transfer <h>%s<b> to %s<b>.", from.describeTo(invoker, true), moneyString(amount), to.describeTo(invoker));
@ -247,7 +247,7 @@ public class Econ {
} }
public static boolean hasAtLeast(EconomyParticipator ep, double delta, String toDoThis) { public static boolean hasAtLeast(EconomyParticipator ep, double delta, String toDoThis) {
if (! shouldBeUsed()) { if (!shouldBeUsed()) {
return true; return true;
} }
@ -270,8 +270,8 @@ public class Econ {
affordable = true; affordable = true;
} }
if (! affordable) { if (!affordable) {
if (toDoThis != null && ! toDoThis.isEmpty()) { if (toDoThis != null && !toDoThis.isEmpty()) {
ep.msg("<h>%s<i> can't afford <h>%s<i> %s.", ep.describeTo(ep, true), moneyString(delta), toDoThis); ep.msg("<h>%s<i> can't afford <h>%s<i> %s.", ep.describeTo(ep, true), moneyString(delta), toDoThis);
} }
return false; return false;
@ -280,7 +280,7 @@ public class Econ {
} }
public static boolean modifyMoney(EconomyParticipator ep, double delta, String toDoThis, String forDoingThis) { public static boolean modifyMoney(EconomyParticipator ep, double delta, String toDoThis, String forDoingThis) {
if (! shouldBeUsed()) { if (!shouldBeUsed()) {
return false; return false;
} }
@ -309,13 +309,13 @@ public class Econ {
EconomyResponse er = econ.depositPlayer(acc, delta); EconomyResponse er = econ.depositPlayer(acc, delta);
if (er.transactionSuccess()) { if (er.transactionSuccess()) {
modifyUniverseMoney(- delta); modifyUniverseMoney(- delta);
if (forDoingThis != null && ! forDoingThis.isEmpty()) { if (forDoingThis != null && !forDoingThis.isEmpty()) {
ep.msg("<h>%s<i> gained <h>%s<i> %s.", You, moneyString(delta), forDoingThis); ep.msg("<h>%s<i> gained <h>%s<i> %s.", You, moneyString(delta), forDoingThis);
} }
return true; return true;
} else { } else {
// transfer to account failed // transfer to account failed
if (forDoingThis != null && ! forDoingThis.isEmpty()) { if (forDoingThis != null && !forDoingThis.isEmpty()) {
ep.msg("<h>%s<i> would have gained <h>%s<i> %s, but the deposit failed.", You, moneyString(delta), forDoingThis); ep.msg("<h>%s<i> would have gained <h>%s<i> %s, but the deposit failed.", You, moneyString(delta), forDoingThis);
} }
return false; return false;
@ -327,13 +327,13 @@ public class Econ {
if (econ.has(acc, - delta) && econ.withdrawPlayer(acc, - delta).transactionSuccess()) { if (econ.has(acc, - delta) && econ.withdrawPlayer(acc, - delta).transactionSuccess()) {
// There is enough money to pay // There is enough money to pay
modifyUniverseMoney(- delta); modifyUniverseMoney(- delta);
if (forDoingThis != null && ! forDoingThis.isEmpty()) { if (forDoingThis != null && !forDoingThis.isEmpty()) {
ep.msg("<h>%s<i> lost <h>%s<i> %s.", You, moneyString(- delta), forDoingThis); ep.msg("<h>%s<i> lost <h>%s<i> %s.", You, moneyString(- delta), forDoingThis);
} }
return true; return true;
} else { } else {
// There was not enough money to pay // There was not enough money to pay
if (toDoThis != null && ! toDoThis.isEmpty()) { if (toDoThis != null && !toDoThis.isEmpty()) {
ep.msg("<h>%s<i> can't afford <h>%s<i> %s.", You, moneyString(- delta), toDoThis); ep.msg("<h>%s<i> can't afford <h>%s<i> %s.", You, moneyString(- delta), toDoThis);
} }
return false; return false;
@ -347,7 +347,7 @@ public class Econ {
// calculate the cost for claiming land // calculate the cost for claiming land
public static double calculateClaimCost(int ownedLand, boolean takingFromAnotherFaction) { public static double calculateClaimCost(int ownedLand, boolean takingFromAnotherFaction) {
if (! shouldBeUsed()) { if (!shouldBeUsed()) {
return 0d; return 0d;
} }

View File

@ -23,7 +23,7 @@ public class Essentials {
// return false if feature is disabled or Essentials isn't available // return false if feature is disabled or Essentials isn't available
public static boolean handleTeleport(Player player, Location loc) { public static boolean handleTeleport(Player player, Location loc) {
if (! Conf.homesTeleportCommandEssentialsIntegration || essentials == null) { if (!Conf.homesTeleportCommandEssentialsIntegration || essentials == null) {
return false; return false;
} }

View File

@ -35,7 +35,7 @@ public class Worldguard {
public static void init(Plugin plugin) { public static void init(Plugin plugin) {
Plugin wgplug = plugin.getServer().getPluginManager().getPlugin("WorldGuard"); Plugin wgplug = plugin.getServer().getPluginManager().getPlugin("WorldGuard");
if (wgplug == null || ! (wgplug instanceof WorldGuardPlugin)) { if (wgplug == null || !(wgplug instanceof WorldGuardPlugin)) {
enabled = false; enabled = false;
wg = null; wg = null;
SavageFactions.plugin.log("Could not hook to WorldGuard. WorldGuard checks are disabled."); SavageFactions.plugin.log("Could not hook to WorldGuard. WorldGuard checks are disabled.");
@ -55,7 +55,7 @@ public class Worldguard {
// True: PVP is allowed // True: PVP is allowed
// False: PVP is disallowed // False: PVP is disallowed
public static boolean isPVP(Player player) { public static boolean isPVP(Player player) {
if (! enabled) { if (!enabled) {
// No WG hooks so we'll always bypass this check. // No WG hooks so we'll always bypass this check.
return true; return true;
} }
@ -74,7 +74,7 @@ public class Worldguard {
// True: Player can build in the region. // True: Player can build in the region.
// False: Player can not build in the region. // False: Player can not build in the region.
public static boolean playerCanBuild(Player player, Location loc) { public static boolean playerCanBuild(Player player, Location loc) {
if (! enabled) { if (!enabled) {
// No WG hooks so we'll always bypass this check. // No WG hooks so we'll always bypass this check.
return false; return false;
} }
@ -103,7 +103,7 @@ public class Worldguard {
} }
public static boolean checkForRegionsInChunk(Chunk chunk) { public static boolean checkForRegionsInChunk(Chunk chunk) {
if (! enabled) { if (!enabled) {
// No WG hooks so we'll always bypass this check. // No WG hooks so we'll always bypass this check.
return false; return false;
} }
@ -128,7 +128,7 @@ public class Worldguard {
try { try {
overlaps = region.getIntersectingRegions(allregionslist); overlaps = region.getIntersectingRegions(allregionslist);
foundregions = overlaps != null && ! overlaps.isEmpty(); foundregions = overlaps != null && !overlaps.isEmpty();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }

View File

@ -104,12 +104,12 @@ public class EngineDynmap {
public void init() { public void init() {
Plugin dynmap = Bukkit.getServer().getPluginManager().getPlugin("dynmap"); Plugin dynmap = Bukkit.getServer().getPluginManager().getPlugin("dynmap");
if (dynmap == null || ! dynmap.isEnabled()) { if (dynmap == null || !dynmap.isEnabled()) {
return; return;
} }
// Should we even use dynmap? // Should we even use dynmap?
if (! Conf.dynmapUse) { if (!Conf.dynmapUse) {
if (this.markerset != null) { if (this.markerset != null) {
this.markerset.deleteMarkerSet(); this.markerset.deleteMarkerSet();
this.markerset = null; this.markerset = null;
@ -126,12 +126,12 @@ public class EngineDynmap {
final Map<String, TempAreaMarker> areas = createAreas(); final Map<String, TempAreaMarker> areas = createAreas();
final Map<String, Set<String>> playerSets = createPlayersets(); final Map<String, Set<String>> playerSets = createPlayersets();
if (! updateCore()) { if (!updateCore()) {
return; return;
} }
// createLayer() is thread safe but it makes use of fields set in updateCore() so we must have it after. // createLayer() is thread safe but it makes use of fields set in updateCore() so we must have it after.
if (! updateLayer(createLayer())) { if (!updateLayer(createLayer())) {
return; return;
} }
@ -171,7 +171,7 @@ public class EngineDynmap {
ret.label = Conf.dynmapLayerName; ret.label = Conf.dynmapLayerName;
ret.minimumZoom = Conf.dynmapLayerMinimumZoom; ret.minimumZoom = Conf.dynmapLayerMinimumZoom;
ret.priority = Conf.dynmapLayerPriority; ret.priority = Conf.dynmapLayerPriority;
ret.hideByDefault = ! Conf.dynmapLayerVisible; ret.hideByDefault = !Conf.dynmapLayerVisible;
return ret; return ret;
} }
@ -323,7 +323,7 @@ public class EngineDynmap {
Map<String, TempAreaMarker> ret = new HashMap<>(); Map<String, TempAreaMarker> ret = new HashMap<>();
// If the faction is visible ... // If the faction is visible ...
if (! isVisible(faction, world)) { if (!isVisible(faction, world)) {
return ret; return ret;
} }
@ -407,10 +407,10 @@ public class EngineDynmap {
while ((currentX != initialX) || (currentZ != initialZ) || (direction != Direction.ZMINUS)) { while ((currentX != initialX) || (currentZ != initialZ) || (direction != Direction.ZMINUS)) {
switch (direction) { switch (direction) {
case XPLUS: // Segment in X+ direction case XPLUS: // Segment in X+ direction
if (! ourChunkFlags.getFlag(currentX + 1, currentZ)) { // Right turn? if (!ourChunkFlags.getFlag(currentX + 1, currentZ)) { // Right turn?
linelist.add(new int[]{currentX + 1, currentZ}); // Finish line linelist.add(new int[]{currentX + 1, currentZ}); // Finish line
direction = Direction.ZPLUS; // Change direction direction = Direction.ZPLUS; // Change direction
} else if (! ourChunkFlags.getFlag(currentX + 1, currentZ - 1)) { // Straight? } else if (!ourChunkFlags.getFlag(currentX + 1, currentZ - 1)) { // Straight?
currentX++; currentX++;
} else { // Left turn } else { // Left turn
linelist.add(new int[]{currentX + 1, currentZ}); // Finish line linelist.add(new int[]{currentX + 1, currentZ}); // Finish line
@ -420,10 +420,10 @@ public class EngineDynmap {
} }
break; break;
case ZPLUS: // Segment in Z+ direction case ZPLUS: // Segment in Z+ direction
if (! ourChunkFlags.getFlag(currentX, currentZ + 1)) { // Right turn? if (!ourChunkFlags.getFlag(currentX, currentZ + 1)) { // Right turn?
linelist.add(new int[]{currentX + 1, currentZ + 1}); // Finish line linelist.add(new int[]{currentX + 1, currentZ + 1}); // Finish line
direction = Direction.XMINUS; // Change direction direction = Direction.XMINUS; // Change direction
} else if (! ourChunkFlags.getFlag(currentX + 1, currentZ + 1)) { // Straight? } else if (!ourChunkFlags.getFlag(currentX + 1, currentZ + 1)) { // Straight?
currentZ++; currentZ++;
} else { // Left turn } else { // Left turn
linelist.add(new int[]{currentX + 1, currentZ + 1}); // Finish line linelist.add(new int[]{currentX + 1, currentZ + 1}); // Finish line
@ -433,10 +433,10 @@ public class EngineDynmap {
} }
break; break;
case XMINUS: // Segment in X- direction case XMINUS: // Segment in X- direction
if (! ourChunkFlags.getFlag(currentX - 1, currentZ)) { // Right turn? if (!ourChunkFlags.getFlag(currentX - 1, currentZ)) { // Right turn?
linelist.add(new int[]{currentX, currentZ + 1}); // Finish line linelist.add(new int[]{currentX, currentZ + 1}); // Finish line
direction = Direction.ZMINUS; // Change direction direction = Direction.ZMINUS; // Change direction
} else if (! ourChunkFlags.getFlag(currentX - 1, currentZ + 1)) { // Straight? } else if (!ourChunkFlags.getFlag(currentX - 1, currentZ + 1)) { // Straight?
currentX--; currentX--;
} else { // Left turn } else { // Left turn
linelist.add(new int[]{currentX, currentZ + 1}); // Finish line linelist.add(new int[]{currentX, currentZ + 1}); // Finish line
@ -446,10 +446,10 @@ public class EngineDynmap {
} }
break; break;
case ZMINUS: // Segment in Z- direction case ZMINUS: // Segment in Z- direction
if (! ourChunkFlags.getFlag(currentX, currentZ - 1)) { // Right turn? if (!ourChunkFlags.getFlag(currentX, currentZ - 1)) { // Right turn?
linelist.add(new int[]{currentX, currentZ}); // Finish line linelist.add(new int[]{currentX, currentZ}); // Finish line
direction = Direction.XPLUS; // Change direction direction = Direction.XPLUS; // Change direction
} else if (! ourChunkFlags.getFlag(currentX - 1, currentZ - 1)) { // Straight? } else if (!ourChunkFlags.getFlag(currentX - 1, currentZ - 1)) { // Straight?
currentZ--; currentZ--;
} else { // Left turn } else { // Left turn
linelist.add(new int[]{currentX, currentZ}); // Finish line linelist.add(new int[]{currentX, currentZ}); // Finish line
@ -571,7 +571,7 @@ public class EngineDynmap {
// Thread Safe / Asynchronous: Yes // Thread Safe / Asynchronous: Yes
public Map<String, Set<String>> createPlayersets() { public Map<String, Set<String>> createPlayersets() {
if (! Conf.dynmapVisibilityByFaction) { if (!Conf.dynmapVisibilityByFaction) {
return null; return null;
} }
@ -600,7 +600,7 @@ public class EngineDynmap {
// Remove // Remove
for (PlayerSet set : this.markerApi.getPlayerSets()) { for (PlayerSet set : this.markerApi.getPlayerSets()) {
if (! set.getSetID().startsWith(FACTIONS_PLAYERSET_)) { if (!set.getSetID().startsWith(FACTIONS_PLAYERSET_)) {
continue; continue;
} }
@ -714,11 +714,11 @@ public class EngineDynmap {
Set<String> visible = Conf.dynmapVisibleFactions; Set<String> visible = Conf.dynmapVisibleFactions;
Set<String> hidden = Conf.dynmapHiddenFactions; Set<String> hidden = Conf.dynmapHiddenFactions;
if (! visible.isEmpty() && ! visible.contains(factionId) && ! visible.contains(factionName) && ! visible.contains("world:" + world)) { if (!visible.isEmpty() && !visible.contains(factionId) && !visible.contains(factionName) && !visible.contains("world:" + world)) {
return false; return false;
} }
return ! hidden.contains(factionId) && ! hidden.contains(factionName) && ! hidden.contains("world:" + world); return !hidden.contains(factionId) && !hidden.contains(factionName) && !hidden.contains("world:" + world);
} }
// Thread Safe / Asynchronous: Yes // Thread Safe / Asynchronous: Yes
@ -744,7 +744,7 @@ public class EngineDynmap {
ArrayDeque<int[]> stack = new ArrayDeque<>(); ArrayDeque<int[]> stack = new ArrayDeque<>();
stack.push(new int[]{x, y}); stack.push(new int[]{x, y});
while (! stack.isEmpty()) { while (!stack.isEmpty()) {
int[] nxt = stack.pop(); int[] nxt = stack.pop();
x = nxt[0]; x = nxt[0];
y = nxt[1]; y = nxt[1];

View File

@ -82,17 +82,17 @@ public class TempAreaMarker {
public void update(AreaMarker marker) { public void update(AreaMarker marker) {
// Corner Locations // Corner Locations
if (! equals(marker, this.x, this.z)) { if (!equals(marker, this.x, this.z)) {
marker.setCornerLocations(this.x, this.z); marker.setCornerLocations(this.x, this.z);
} }
// Label // Label
if (! marker.getLabel().equals(this.label)) { if (!marker.getLabel().equals(this.label)) {
marker.setLabel(this.label); marker.setLabel(this.label);
} }
// Description // Description
if (! marker.getDescription().equals(this.description)) { if (!marker.getDescription().equals(this.description)) {
marker.setDescription(this.description); marker.setDescription(this.description);
} }

View File

@ -53,11 +53,11 @@ public class TempMarker {
// -------------------------------------------- // // -------------------------------------------- //
public void update(MarkerAPI markerApi, Marker marker) { public void update(MarkerAPI markerApi, Marker marker) {
if (! this.world.equals(marker.getWorld()) || this.x != marker.getX() || this.y != marker.getY() || this.z != marker.getZ()) { if (!this.world.equals(marker.getWorld()) || this.x != marker.getX() || this.y != marker.getY() || this.z != marker.getZ()) {
marker.setLocation(this.world, this.x, this.y, this.z); marker.setLocation(this.world, this.x, this.y, this.z);
} }
if (! marker.getLabel().equals(this.label)) { if (!marker.getLabel().equals(this.label)) {
marker.setLabel(this.label); marker.setLabel(this.label);
} }
@ -66,7 +66,7 @@ public class TempMarker {
marker.setMarkerIcon(icon); marker.setMarkerIcon(icon);
} }
if (! marker.getDescription().equals(this.description)) { if (!marker.getDescription().equals(this.description)) {
marker.setDescription(this.description); marker.setDescription(this.description);
} }
} }

View File

@ -33,7 +33,7 @@ public class TempMarkerSet {
public void update(MarkerSet markerset) { public void update(MarkerSet markerset) {
// Name // Name
if (! markerset.getMarkerSetLabel().equals(this.label)) { if (!markerset.getMarkerSetLabel().equals(this.label)) {
markerset.setMarkerSetLabel(this.label); markerset.setMarkerSetLabel(this.label);
} }

View File

@ -59,11 +59,11 @@ public class FactionsBlockListener implements Listener {
return true; return true;
} }
if (! Conf.wildernessDenyBuild || Conf.worldsNoWildernessProtection.contains(location.getWorld().getName())) { if (!Conf.wildernessDenyBuild || Conf.worldsNoWildernessProtection.contains(location.getWorld().getName())) {
return true; // This is not faction territory. Use whatever you like here. return true; // This is not faction territory. Use whatever you like here.
} }
if (! justCheck) { if (!justCheck) {
me.msg("<b>You can't " + action + " in the wilderness."); me.msg("<b>You can't " + action + " in the wilderness.");
} }
@ -73,11 +73,11 @@ public class FactionsBlockListener implements Listener {
return true; return true;
} }
if (! Conf.safeZoneDenyBuild || Permission.MANAGE_SAFE_ZONE.has(player)) { if (!Conf.safeZoneDenyBuild || Permission.MANAGE_SAFE_ZONE.has(player)) {
return true; return true;
} }
if (! justCheck) { if (!justCheck) {
me.msg("<b>You can't " + action + " in a safe zone."); me.msg("<b>You can't " + action + " in a safe zone.");
} }
@ -87,11 +87,11 @@ public class FactionsBlockListener implements Listener {
return true; return true;
} }
if (! Conf.warZoneDenyBuild || Permission.MANAGE_WAR_ZONE.has(player)) { if (!Conf.warZoneDenyBuild || Permission.MANAGE_WAR_ZONE.has(player)) {
return true; return true;
} }
if (! justCheck) { if (!justCheck) {
me.msg("<b>You can't " + action + " in a war zone."); me.msg("<b>You can't " + action + " in a war zone.");
} }
@ -104,7 +104,7 @@ public class FactionsBlockListener implements Listener {
Faction myFaction = me.getFaction(); Faction myFaction = me.getFaction();
Relation rel = myFaction.getRelationTo(otherFaction); Relation rel = myFaction.getRelationTo(otherFaction);
boolean online = otherFaction.hasPlayersOnline(); boolean online = otherFaction.hasPlayersOnline();
boolean pain = ! justCheck && rel.confPainBuild(online); boolean pain = !justCheck && rel.confPainBuild(online);
boolean deny = rel.confDenyBuild(online); boolean deny = rel.confDenyBuild(online);
Access access = otherFaction.getAccess(me, PermissableAction.fromString(action)); Access access = otherFaction.getAccess(me, PermissableAction.fromString(action));
@ -115,7 +115,7 @@ public class FactionsBlockListener implements Listener {
if (pain) { if (pain) {
player.damage(Conf.actionDeniedPainAmount); player.damage(Conf.actionDeniedPainAmount);
if (! deny) { if (!deny) {
me.msg("<b>It is painful to try to " + action + " in the territory of " + otherFaction.getTag(myFaction)); me.msg("<b>It is painful to try to " + action + " in the territory of " + otherFaction.getTag(myFaction));
} }
} }
@ -123,7 +123,7 @@ public class FactionsBlockListener implements Listener {
// cancel building/destroying in other territory? // cancel building/destroying in other territory?
if (deny) { if (deny) {
if (! justCheck) { if (!justCheck) {
me.msg("<b>You can't " + action + " in the territory of " + otherFaction.getTag(myFaction)); me.msg("<b>You can't " + action + " in the territory of " + otherFaction.getTag(myFaction));
} }
@ -131,15 +131,15 @@ public class FactionsBlockListener implements Listener {
} }
// Also cancel and/or cause pain if player doesn't have ownership rights for this claim // Also cancel and/or cause pain if player doesn't have ownership rights for this claim
if (Conf.ownedAreasEnabled && (Conf.ownedAreaDenyBuild || Conf.ownedAreaPainBuild) && ! otherFaction.playerHasOwnershipRights(me, loc)) { if (Conf.ownedAreasEnabled && (Conf.ownedAreaDenyBuild || Conf.ownedAreaPainBuild) && !otherFaction.playerHasOwnershipRights(me, loc)) {
if (! pain && Conf.ownedAreaPainBuild && ! justCheck) { if (!pain && Conf.ownedAreaPainBuild && !justCheck) {
player.damage(Conf.actionDeniedPainAmount); player.damage(Conf.actionDeniedPainAmount);
if (! Conf.ownedAreaDenyBuild) { if (!Conf.ownedAreaDenyBuild) {
me.msg("<b>It is painful to try to " + action + " in this territory, it is owned by: " + otherFaction.getOwnerListString(loc)); me.msg("<b>It is painful to try to " + action + " in this territory, it is owned by: " + otherFaction.getOwnerListString(loc));
} }
} }
if (Conf.ownedAreaDenyBuild) { if (Conf.ownedAreaDenyBuild) {
if (! justCheck) { if (!justCheck) {
me.msg("<b>You can't " + action + " in this territory, it is owned by: " + otherFaction.getOwnerListString(loc)); me.msg("<b>You can't " + action + " in this territory, it is owned by: " + otherFaction.getOwnerListString(loc));
return false; return false;
} }
@ -153,7 +153,7 @@ public class FactionsBlockListener implements Listener {
if (access == Access.DENY) { if (access == Access.DENY) {
me.msg(TL.GENERIC_NOPERMISSION, action); me.msg(TL.GENERIC_NOPERMISSION, action);
return false; return false;
} else if (myFaction.getOwnerListString(loc) != null && ! myFaction.getOwnerListString(loc).isEmpty() && ! myFaction.getOwnerListString(loc).contains(player.getName())) { } else if (myFaction.getOwnerListString(loc) != null && !myFaction.getOwnerListString(loc).isEmpty() && !myFaction.getOwnerListString(loc).contains(player.getName())) {
me.msg("<b>You can't " + action + " in this territory, it is owned by: " + myFaction.getOwnerListString(loc)); me.msg("<b>You can't " + action + " in this territory, it is owned by: " + myFaction.getOwnerListString(loc));
return false; return false;
} }
@ -163,7 +163,7 @@ public class FactionsBlockListener implements Listener {
@EventHandler (priority = EventPriority.NORMAL, ignoreCancelled = true) @EventHandler (priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onBlockPlace(BlockPlaceEvent event) { public void onBlockPlace(BlockPlaceEvent event) {
if (! event.canBuild()) { if (!event.canBuild()) {
return; return;
} }
@ -172,14 +172,14 @@ public class FactionsBlockListener implements Listener {
return; return;
} }
if (! playerCanBuildDestroyBlock(event.getPlayer(), event.getBlock().getLocation(), "build", false)) { if (!playerCanBuildDestroyBlock(event.getPlayer(), event.getBlock().getLocation(), "build", false)) {
event.setCancelled(true); event.setCancelled(true);
} }
} }
@EventHandler (priority = EventPriority.NORMAL, ignoreCancelled = true) @EventHandler (priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onBlockFromTo(BlockFromToEvent event) { public void onBlockFromTo(BlockFromToEvent event) {
if (! Conf.handleExploitLiquidFlow) { if (!Conf.handleExploitLiquidFlow) {
return; return;
} }
if (event.getBlock().isLiquid()) { if (event.getBlock().isLiquid()) {
@ -203,14 +203,14 @@ public class FactionsBlockListener implements Listener {
@EventHandler (priority = EventPriority.NORMAL, ignoreCancelled = true) @EventHandler (priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onBlockDamage(BlockDamageEvent event) { public void onBlockDamage(BlockDamageEvent event) {
if (event.getInstaBreak() && ! playerCanBuildDestroyBlock(event.getPlayer(), event.getBlock().getLocation(), "destroy", false)) { if (event.getInstaBreak() && !playerCanBuildDestroyBlock(event.getPlayer(), event.getBlock().getLocation(), "destroy", false)) {
event.setCancelled(true); event.setCancelled(true);
} }
} }
@EventHandler (priority = EventPriority.NORMAL, ignoreCancelled = true) @EventHandler (priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onBlockPistonExtend(BlockPistonExtendEvent event) { public void onBlockPistonExtend(BlockPistonExtendEvent event) {
if (! Conf.pistonProtectionThroughDenyBuild) { if (!Conf.pistonProtectionThroughDenyBuild) {
return; return;
} }
@ -220,7 +220,7 @@ public class FactionsBlockListener implements Listener {
Block targetBlock = event.getBlock().getRelative(event.getDirection(), event.getLength() + 1); Block targetBlock = event.getBlock().getRelative(event.getDirection(), event.getLength() + 1);
// if potentially pushing into air/water/lava in another territory, we need to check it out // if potentially pushing into air/water/lava in another territory, we need to check it out
if ((targetBlock.isEmpty() || targetBlock.isLiquid()) && ! canPistonMoveBlock(pistonFaction, targetBlock.getLocation())) { if ((targetBlock.isEmpty() || targetBlock.isLiquid()) && !canPistonMoveBlock(pistonFaction, targetBlock.getLocation())) {
event.setCancelled(true); event.setCancelled(true);
} }
@ -279,7 +279,7 @@ public class FactionsBlockListener implements Listener {
@EventHandler @EventHandler
public void onHopperPlace(BlockPlaceEvent e) { public void onHopperPlace(BlockPlaceEvent e) {
if (e.getItemInHand().getType() != Material.HOPPER && ! SavageFactions.plugin.getConfig().getBoolean("fvault.No-Hoppers-near-vault")) { if (e.getItemInHand().getType() != Material.HOPPER && !SavageFactions.plugin.getConfig().getBoolean("fvault.No-Hoppers-near-vault")) {
return; return;
} }
@ -318,7 +318,7 @@ public class FactionsBlockListener implements Listener {
@EventHandler (priority = EventPriority.NORMAL, ignoreCancelled = true) @EventHandler (priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onBlockPistonRetract(BlockPistonRetractEvent event) { public void onBlockPistonRetract(BlockPistonRetractEvent event) {
// if not a sticky piston, retraction should be fine // if not a sticky piston, retraction should be fine
if (! event.isSticky() || ! Conf.pistonProtectionThroughDenyBuild) { if (!event.isSticky() || !Conf.pistonProtectionThroughDenyBuild) {
return; return;
} }
@ -338,7 +338,7 @@ public class FactionsBlockListener implements Listener {
Faction pistonFaction = Board.getInstance().getFactionAt(new FLocation(event.getBlock())); Faction pistonFaction = Board.getInstance().getFactionAt(new FLocation(event.getBlock()));
if (! canPistonMoveBlock(pistonFaction, targetLoc)) { if (!canPistonMoveBlock(pistonFaction, targetLoc)) {
event.setCancelled(true); event.setCancelled(true);
} }
} }
@ -462,12 +462,12 @@ public class FactionsBlockListener implements Listener {
// only notify every 10 seconds // only notify every 10 seconds
FPlayer fPlayer = FPlayers.getInstance().getByPlayer(player); FPlayer fPlayer = FPlayers.getInstance().getByPlayer(player);
boolean justCheck = fPlayer.getLastFrostwalkerMessage() + 10000 > System.currentTimeMillis(); boolean justCheck = fPlayer.getLastFrostwalkerMessage() + 10000 > System.currentTimeMillis();
if (! justCheck) { if (!justCheck) {
fPlayer.setLastFrostwalkerMessage(); fPlayer.setLastFrostwalkerMessage();
} }
// Check if they have build permissions here. If not, block this from happening. // Check if they have build permissions here. If not, block this from happening.
if (! playerCanBuildDestroyBlock(player, location, "frostwalk", justCheck)) { if (!playerCanBuildDestroyBlock(player, location, "frostwalk", justCheck)) {
event.setCancelled(true); event.setCancelled(true);
} }
} }
@ -481,33 +481,33 @@ public class FactionsBlockListener implements Listener {
} }
if (otherFaction.isWilderness()) { if (otherFaction.isWilderness()) {
return ! Conf.wildernessDenyBuild || Conf.worldsNoWildernessProtection.contains(target.getWorld().getName()); return !Conf.wildernessDenyBuild || Conf.worldsNoWildernessProtection.contains(target.getWorld().getName());
} else if (otherFaction.isSafeZone()) { } else if (otherFaction.isSafeZone()) {
return ! Conf.safeZoneDenyBuild; return !Conf.safeZoneDenyBuild;
} else if (otherFaction.isWarZone()) { } else if (otherFaction.isWarZone()) {
return ! Conf.warZoneDenyBuild; return !Conf.warZoneDenyBuild;
} }
Relation rel = pistonFaction.getRelationTo(otherFaction); Relation rel = pistonFaction.getRelationTo(otherFaction);
return ! rel.confDenyBuild(otherFaction.hasPlayersOnline()); return !rel.confDenyBuild(otherFaction.hasPlayersOnline());
} }
@EventHandler (priority = EventPriority.NORMAL, ignoreCancelled = true) @EventHandler (priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onBlockBreak(BlockBreakEvent event) { public void onBlockBreak(BlockBreakEvent event) {
if (! playerCanBuildDestroyBlock(event.getPlayer(), event.getBlock().getLocation(), "destroy", false)) { if (!playerCanBuildDestroyBlock(event.getPlayer(), event.getBlock().getLocation(), "destroy", false)) {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
FPlayer fme = FPlayers.getInstance().getByPlayer(event.getPlayer()); FPlayer fme = FPlayers.getInstance().getByPlayer(event.getPlayer());
if (! fme.hasFaction()) { if (!fme.hasFaction()) {
return; return;
} }
if (event.getBlock().getType() == SavageFactions.plugin.MOB_SPANWER) { if (event.getBlock().getType() == SavageFactions.plugin.MOB_SPANWER) {
if (! fme.isAdminBypassing()) { if (!fme.isAdminBypassing()) {
Access access = fme.getFaction().getAccess(fme, PermissableAction.SPAWNER); Access access = fme.getFaction().getAccess(fme, PermissableAction.SPAWNER);
if (access != Access.ALLOW && fme.getRole() != Role.LEADER) { if (access != Access.ALLOW && fme.getRole() != Role.LEADER) {
fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "mine spawners"); fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "mine spawners");

View File

@ -100,7 +100,7 @@ public class FactionsChatListener implements Listener {
//Send to all our allies //Send to all our allies
for (FPlayer fplayer : FPlayers.getInstance().getOnlinePlayers()) { for (FPlayer fplayer : FPlayers.getInstance().getOnlinePlayers()) {
if (myFaction.getRelationTo(fplayer) == Relation.ALLY && ! fplayer.isIgnoreAllianceChat()) { if (myFaction.getRelationTo(fplayer) == Relation.ALLY && !fplayer.isIgnoreAllianceChat()) {
fplayer.sendMessage(message); fplayer.sendMessage(message);
} else if (fplayer.isSpyingChat() && me != fplayer) { } else if (fplayer.isSpyingChat() && me != fplayer) {
fplayer.sendMessage("[ACspy]: " + message); fplayer.sendMessage("[ACspy]: " + message);
@ -138,7 +138,7 @@ public class FactionsChatListener implements Listener {
public void onPlayerChat(AsyncPlayerChatEvent event) { public void onPlayerChat(AsyncPlayerChatEvent event) {
// Are we to insert the Faction tag into the format? // Are we to insert the Faction tag into the format?
// If we are not to insert it - we are done. // If we are not to insert it - we are done.
if (! Conf.chatTagEnabled || Conf.chatTagHandledByAnotherPlugin) { if (!Conf.chatTagEnabled || Conf.chatTagHandledByAnotherPlugin) {
return; return;
} }
@ -148,7 +148,7 @@ public class FactionsChatListener implements Listener {
FPlayer me = FPlayers.getInstance().getByPlayer(talkingPlayer); FPlayer me = FPlayers.getInstance().getByPlayer(talkingPlayer);
int InsertIndex; int InsertIndex;
if (! Conf.chatTagReplaceString.isEmpty() && eventFormat.contains(Conf.chatTagReplaceString)) { if (!Conf.chatTagReplaceString.isEmpty() && eventFormat.contains(Conf.chatTagReplaceString)) {
// we're using the "replace" method of inserting the faction tags // we're using the "replace" method of inserting the faction tags
if (eventFormat.contains("[FACTION_TITLE]")) { if (eventFormat.contains("[FACTION_TITLE]")) {
eventFormat = eventFormat.replace("[FACTION_TITLE]", me.getTitle()); eventFormat = eventFormat.replace("[FACTION_TITLE]", me.getTitle());
@ -158,10 +158,10 @@ public class FactionsChatListener implements Listener {
eventFormat = eventFormat.replace(Conf.chatTagReplaceString, ""); eventFormat = eventFormat.replace(Conf.chatTagReplaceString, "");
Conf.chatTagPadAfter = false; Conf.chatTagPadAfter = false;
Conf.chatTagPadBefore = false; Conf.chatTagPadBefore = false;
} else if (! Conf.chatTagInsertAfterString.isEmpty() && eventFormat.contains(Conf.chatTagInsertAfterString)) { } else if (!Conf.chatTagInsertAfterString.isEmpty() && eventFormat.contains(Conf.chatTagInsertAfterString)) {
// we're using the "insert after string" method // we're using the "insert after string" method
InsertIndex = eventFormat.indexOf(Conf.chatTagInsertAfterString) + Conf.chatTagInsertAfterString.length(); InsertIndex = eventFormat.indexOf(Conf.chatTagInsertAfterString) + Conf.chatTagInsertAfterString.length();
} else if (! Conf.chatTagInsertBeforeString.isEmpty() && eventFormat.contains(Conf.chatTagInsertBeforeString)) { } else if (!Conf.chatTagInsertBeforeString.isEmpty() && eventFormat.contains(Conf.chatTagInsertBeforeString)) {
// we're using the "insert before string" method // we're using the "insert before string" method
InsertIndex = eventFormat.indexOf(Conf.chatTagInsertBeforeString); InsertIndex = eventFormat.indexOf(Conf.chatTagInsertBeforeString);
} else { } else {
@ -172,8 +172,8 @@ public class FactionsChatListener implements Listener {
} }
} }
String formatStart = eventFormat.substring(0, InsertIndex) + ((Conf.chatTagPadBefore && ! me.getChatTag().isEmpty()) ? " " : ""); String formatStart = eventFormat.substring(0, InsertIndex) + ((Conf.chatTagPadBefore && !me.getChatTag().isEmpty()) ? " " : "");
String formatEnd = ((Conf.chatTagPadAfter && ! me.getChatTag().isEmpty()) ? " " : "") + eventFormat.substring(InsertIndex); String formatEnd = ((Conf.chatTagPadAfter && !me.getChatTag().isEmpty()) ? " " : "") + eventFormat.substring(InsertIndex);
String nonColoredMsgFormat = formatStart + me.getChatTag().trim() + formatEnd; String nonColoredMsgFormat = formatStart + me.getChatTag().trim() + formatEnd;

View File

@ -41,7 +41,7 @@ public class FactionsEntityListener implements Listener {
@EventHandler (priority = EventPriority.NORMAL) @EventHandler (priority = EventPriority.NORMAL)
public void onEntityDeath(EntityDeathEvent event) { public void onEntityDeath(EntityDeathEvent event) {
Entity entity = event.getEntity(); Entity entity = event.getEntity();
if (! (entity instanceof Player)) { if (!(entity instanceof Player)) {
return; return;
} }
@ -53,14 +53,14 @@ public class FactionsEntityListener implements Listener {
// Check for no power loss conditions // Check for no power loss conditions
if (faction.isWarZone()) { if (faction.isWarZone()) {
// war zones always override worldsNoPowerLoss either way, thus this layout // war zones always override worldsNoPowerLoss either way, thus this layout
if (! Conf.warZonePowerLoss) { if (!Conf.warZonePowerLoss) {
powerLossEvent.setMessage(TL.PLAYER_POWER_NOLOSS_WARZONE.toString()); powerLossEvent.setMessage(TL.PLAYER_POWER_NOLOSS_WARZONE.toString());
powerLossEvent.setCancelled(true); powerLossEvent.setCancelled(true);
} }
if (Conf.worldsNoPowerLoss.contains(player.getWorld().getName())) { if (Conf.worldsNoPowerLoss.contains(player.getWorld().getName())) {
powerLossEvent.setMessage(TL.PLAYER_POWER_LOSS_WARZONE.toString()); powerLossEvent.setMessage(TL.PLAYER_POWER_LOSS_WARZONE.toString());
} }
} else if (faction.isWilderness() && ! Conf.wildernessPowerLoss && ! Conf.worldsNoWildernessProtection.contains(player.getWorld().getName())) { } else if (faction.isWilderness() && !Conf.wildernessPowerLoss && !Conf.worldsNoWildernessProtection.contains(player.getWorld().getName())) {
powerLossEvent.setMessage(TL.PLAYER_POWER_NOLOSS_WILDERNESS.toString()); powerLossEvent.setMessage(TL.PLAYER_POWER_NOLOSS_WILDERNESS.toString());
powerLossEvent.setCancelled(true); powerLossEvent.setCancelled(true);
} else if (Conf.worldsNoPowerLoss.contains(player.getWorld().getName())) { } else if (Conf.worldsNoPowerLoss.contains(player.getWorld().getName())) {
@ -77,12 +77,12 @@ public class FactionsEntityListener implements Listener {
Bukkit.getPluginManager().callEvent(powerLossEvent); Bukkit.getPluginManager().callEvent(powerLossEvent);
// Call player onDeath if the event is not cancelled // Call player onDeath if the event is not cancelled
if (! powerLossEvent.isCancelled()) { if (!powerLossEvent.isCancelled()) {
fplayer.onDeath(); fplayer.onDeath();
} }
// Send the message from the powerLossEvent // Send the message from the powerLossEvent
final String msg = powerLossEvent.getMessage(); final String msg = powerLossEvent.getMessage();
if (msg != null && ! msg.isEmpty()) { if (msg != null && !msg.isEmpty()) {
fplayer.msg(msg, fplayer.getPowerRounded(), fplayer.getPowerMaxRounded()); fplayer.msg(msg, fplayer.getPowerRounded(), fplayer.getPowerMaxRounded());
} }
} }
@ -95,7 +95,7 @@ public class FactionsEntityListener implements Listener {
public void onEntityDamage(EntityDamageEvent event) { public void onEntityDamage(EntityDamageEvent event) {
if (event instanceof EntityDamageByEntityEvent) { if (event instanceof EntityDamageByEntityEvent) {
EntityDamageByEntityEvent sub = (EntityDamageByEntityEvent) event; EntityDamageByEntityEvent sub = (EntityDamageByEntityEvent) event;
if (! this.canDamagerHurtDamagee(sub, true)) { if (!this.canDamagerHurtDamagee(sub, true)) {
event.setCancelled(true); event.setCancelled(true);
} }
// event is not cancelled by factions // event is not cancelled by factions
@ -152,13 +152,13 @@ public class FactionsEntityListener implements Listener {
entityAction = "armor stands"; entityAction = "armor stands";
} }
if (! FactionsBlockListener.playerCanBuildDestroyBlock((Player) damager, damagee.getLocation(), "destroy " + entityAction, false)) { if (!FactionsBlockListener.playerCanBuildDestroyBlock((Player) damager, damagee.getLocation(), "destroy " + entityAction, false)) {
event.setCancelled(true); event.setCancelled(true);
} }
} else { } else {
// we don't want to let mobs/arrows destroy item frames/armor stands // we don't want to let mobs/arrows destroy item frames/armor stands
// so we only have to run the check as if there had been an explosion at the damager location // so we only have to run the check as if there had been an explosion at the damager location
if (! this.checkExplosionForBlock(damager, damagee.getLocation().getBlock())) { if (!this.checkExplosionForBlock(damager, damagee.getLocation().getBlock())) {
event.setCancelled(true); event.setCancelled(true);
} }
} }
@ -198,7 +198,7 @@ public class FactionsEntityListener implements Listener {
} else if (event.getCause() == EntityDamageEvent.DamageCause.FALL && event.getEntity() instanceof Player) { } else if (event.getCause() == EntityDamageEvent.DamageCause.FALL && event.getEntity() instanceof Player) {
Player player = (Player) event.getEntity(); Player player = (Player) event.getEntity();
FPlayer fPlayer = FPlayers.getInstance().getByPlayer(player); FPlayer fPlayer = FPlayers.getInstance().getByPlayer(player);
if (fPlayer != null && ! fPlayer.shouldTakeFallDamage()) { if (fPlayer != null && !fPlayer.shouldTakeFallDamage()) {
event.setCancelled(true); // Falling after /f fly event.setCancelled(true); // Falling after /f fly
} }
} }
@ -243,7 +243,7 @@ public class FactionsEntityListener implements Listener {
Entity boomer = event.getEntity(); Entity boomer = event.getEntity();
// Before we need to check the location where the block is placed // Before we need to check the location where the block is placed
if (! this.checkExplosionForBlock(boomer, event.getLocation().getBlock())) { if (!this.checkExplosionForBlock(boomer, event.getLocation().getBlock())) {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
@ -254,7 +254,7 @@ public class FactionsEntityListener implements Listener {
while (blockList.hasNext()) { while (blockList.hasNext()) {
Block block = blockList.next(); Block block = blockList.next();
if (! this.checkExplosionForBlock(boomer, block)) { if (!this.checkExplosionForBlock(boomer, block)) {
// The block don't have to explode // The block don't have to explode
blockList.remove(); blockList.remove();
} }
@ -301,7 +301,7 @@ public class FactionsEntityListener implements Listener {
boolean online = faction.hasPlayersOnline(); boolean online = faction.hasPlayersOnline();
if (boomer instanceof Creeper && ((faction.isWilderness() && Conf.wildernessBlockCreepers && ! Conf.worldsNoWildernessProtection.contains(block.getWorld().getName())) || if (boomer instanceof Creeper && ((faction.isWilderness() && Conf.wildernessBlockCreepers && !Conf.worldsNoWildernessProtection.contains(block.getWorld().getName())) ||
(faction.isNormal() && (online ? Conf.territoryBlockCreepers : Conf.territoryBlockCreepersWhenOffline)) || (faction.isNormal() && (online ? Conf.territoryBlockCreepers : Conf.territoryBlockCreepersWhenOffline)) ||
(faction.isWarZone() && Conf.warZoneBlockCreepers) || (faction.isWarZone() && Conf.warZoneBlockCreepers) ||
faction.isSafeZone())) { faction.isSafeZone())) {
@ -309,17 +309,17 @@ public class FactionsEntityListener implements Listener {
return false; return false;
} else if ( } else if (
// it's a bit crude just using fireball protection for Wither boss too, but I'd rather not add in a whole new set of xxxBlockWitherExplosion or whatever // it's a bit crude just using fireball protection for Wither boss too, but I'd rather not add in a whole new set of xxxBlockWitherExplosion or whatever
(boomer instanceof Fireball || boomer instanceof WitherSkull || boomer instanceof Wither) && ((faction.isWilderness() && Conf.wildernessBlockFireballs && ! Conf.worldsNoWildernessProtection.contains(block.getWorld().getName())) || (boomer instanceof Fireball || boomer instanceof WitherSkull || boomer instanceof Wither) && ((faction.isWilderness() && Conf.wildernessBlockFireballs && !Conf.worldsNoWildernessProtection.contains(block.getWorld().getName())) ||
(faction.isNormal() && (online ? Conf.territoryBlockFireballs : Conf.territoryBlockFireballsWhenOffline)) || (faction.isNormal() && (online ? Conf.territoryBlockFireballs : Conf.territoryBlockFireballsWhenOffline)) ||
(faction.isWarZone() && Conf.warZoneBlockFireballs) || (faction.isWarZone() && Conf.warZoneBlockFireballs) ||
faction.isSafeZone())) { faction.isSafeZone())) {
// ghast fireball which needs prevention // ghast fireball which needs prevention
return false; return false;
} else } else
return (! (boomer instanceof TNTPrimed) && ! (boomer instanceof ExplosiveMinecart)) || ((! faction.isWilderness() || ! Conf.wildernessBlockTNT || Conf.worldsNoWildernessProtection.contains(block.getWorld().getName())) && return (!(boomer instanceof TNTPrimed) && !(boomer instanceof ExplosiveMinecart)) || ((!faction.isWilderness() || !Conf.wildernessBlockTNT || Conf.worldsNoWildernessProtection.contains(block.getWorld().getName())) &&
(! faction.isNormal() || (online ? ! Conf.territoryBlockTNT : ! Conf.territoryBlockTNTWhenOffline)) && (!faction.isNormal() || (online ? !Conf.territoryBlockTNT : !Conf.territoryBlockTNTWhenOffline)) &&
(! faction.isWarZone() || ! Conf.warZoneBlockTNT) && (!faction.isWarZone() || !Conf.warZoneBlockTNT) &&
(! faction.isSafeZone() || ! Conf.safeZoneBlockTNT)); (!faction.isSafeZone() || !Conf.safeZoneBlockTNT));
// No condition retained, destroy the block! // No condition retained, destroy the block!
} }
@ -328,7 +328,7 @@ public class FactionsEntityListener implements Listener {
@EventHandler (priority = EventPriority.NORMAL, ignoreCancelled = true) @EventHandler (priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onEntityCombustByEntity(EntityCombustByEntityEvent event) { public void onEntityCombustByEntity(EntityCombustByEntityEvent event) {
EntityDamageByEntityEvent sub = new EntityDamageByEntityEvent(event.getCombuster(), event.getEntity(), EntityDamageEvent.DamageCause.FIRE, 0d); EntityDamageByEntityEvent sub = new EntityDamageByEntityEvent(event.getCombuster(), event.getEntity(), EntityDamageEvent.DamageCause.FIRE, 0d);
if (! this.canDamagerHurtDamagee(sub, false)) { if (!this.canDamagerHurtDamagee(sub, false)) {
event.setCancelled(true); event.setCancelled(true);
} }
} }
@ -343,12 +343,12 @@ public class FactionsEntityListener implements Listener {
break; break;
} }
} }
if (! badjuju) { if (!badjuju) {
return; return;
} }
ProjectileSource thrower = event.getPotion().getShooter(); ProjectileSource thrower = event.getPotion().getShooter();
if (! (thrower instanceof Entity)) { if (!(thrower instanceof Entity)) {
return; return;
} }
@ -364,14 +364,14 @@ public class FactionsEntityListener implements Listener {
// scan through affected entities to make sure they're all valid targets // scan through affected entities to make sure they're all valid targets
for (LivingEntity target : event.getAffectedEntities()) { for (LivingEntity target : event.getAffectedEntities()) {
EntityDamageByEntityEvent sub = new EntityDamageByEntityEvent((Entity) thrower, target, EntityDamageEvent.DamageCause.CUSTOM, 0); EntityDamageByEntityEvent sub = new EntityDamageByEntityEvent((Entity) thrower, target, EntityDamageEvent.DamageCause.CUSTOM, 0);
if (! this.canDamagerHurtDamagee(sub, true)) { if (!this.canDamagerHurtDamagee(sub, true)) {
event.setIntensity(target, 0.0); // affected entity list doesn't accept modification (so no iter.remove()), but this works event.setIntensity(target, 0.0); // affected entity list doesn't accept modification (so no iter.remove()), but this works
} }
} }
} }
public boolean isPlayerInSafeZone(Entity damagee) { public boolean isPlayerInSafeZone(Entity damagee) {
if (! (damagee instanceof Player)) { if (!(damagee instanceof Player)) {
return false; return false;
} }
return Board.getInstance().getFactionAt(new FLocation(damagee.getLocation())).isSafeZone(); return Board.getInstance().getFactionAt(new FLocation(damagee.getLocation())).isSafeZone();
@ -385,7 +385,7 @@ public class FactionsEntityListener implements Listener {
Entity damager = sub.getDamager(); Entity damager = sub.getDamager();
Entity damagee = sub.getEntity(); Entity damagee = sub.getEntity();
if (! (damagee instanceof Player)) { if (!(damagee instanceof Player)) {
return true; return true;
} }
@ -402,7 +402,7 @@ public class FactionsEntityListener implements Listener {
if (damager instanceof Projectile) { if (damager instanceof Projectile) {
Projectile projectile = (Projectile) damager; Projectile projectile = (Projectile) damager;
if (! (projectile.getShooter() instanceof Entity)) { if (!(projectile.getShooter() instanceof Entity)) {
return true; return true;
} }
@ -423,10 +423,10 @@ public class FactionsEntityListener implements Listener {
} }
return false; return false;
} }
return ! defLocFaction.noMonstersInTerritory(); return !defLocFaction.noMonstersInTerritory();
} }
if (! (damager instanceof Player)) { if (!(damager instanceof Player)) {
return true; return true;
} }
@ -508,7 +508,7 @@ public class FactionsEntityListener implements Listener {
} }
// Players without faction may be hurt anywhere // Players without faction may be hurt anywhere
if (! defender.hasFaction()) { if (!defender.hasFaction()) {
return true; return true;
} }
@ -567,7 +567,7 @@ public class FactionsEntityListener implements Listener {
} }
// We are interested in blocking targeting for certain mobs: // We are interested in blocking targeting for certain mobs:
if (! Conf.safeZoneNerfedCreatureTypes.contains(MiscUtil.creatureTypeFromEntity(event.getEntity()))) { if (!Conf.safeZoneNerfedCreatureTypes.contains(MiscUtil.creatureTypeFromEntity(event.getEntity()))) {
return; return;
} }
@ -590,7 +590,7 @@ public class FactionsEntityListener implements Listener {
boolean online = faction.hasPlayersOnline(); boolean online = faction.hasPlayersOnline();
if ((faction.isWilderness() && ! Conf.worldsNoWildernessProtection.contains(loc.getWorld().getName()) && (Conf.wildernessBlockCreepers || Conf.wildernessBlockFireballs || Conf.wildernessBlockTNT)) || if ((faction.isWilderness() && !Conf.worldsNoWildernessProtection.contains(loc.getWorld().getName()) && (Conf.wildernessBlockCreepers || Conf.wildernessBlockFireballs || Conf.wildernessBlockTNT)) ||
(faction.isNormal() && (online ? (Conf.territoryBlockCreepers || Conf.territoryBlockFireballs || Conf.territoryBlockTNT) : (Conf.territoryBlockCreepersWhenOffline || Conf.territoryBlockFireballsWhenOffline || Conf.territoryBlockTNTWhenOffline))) || (faction.isNormal() && (online ? (Conf.territoryBlockCreepers || Conf.territoryBlockFireballs || Conf.territoryBlockTNT) : (Conf.territoryBlockCreepersWhenOffline || Conf.territoryBlockFireballsWhenOffline || Conf.territoryBlockTNTWhenOffline))) ||
(faction.isWarZone() && (Conf.warZoneBlockCreepers || Conf.warZoneBlockFireballs || Conf.warZoneBlockTNT)) || (faction.isWarZone() && (Conf.warZoneBlockCreepers || Conf.warZoneBlockFireballs || Conf.warZoneBlockTNT)) ||
faction.isSafeZone()) { faction.isSafeZone()) {
@ -599,23 +599,23 @@ public class FactionsEntityListener implements Listener {
} }
} }
if (! (event instanceof HangingBreakByEntityEvent)) { if (!(event instanceof HangingBreakByEntityEvent)) {
return; return;
} }
Entity breaker = ((HangingBreakByEntityEvent) event).getRemover(); Entity breaker = ((HangingBreakByEntityEvent) event).getRemover();
if (! (breaker instanceof Player)) { if (!(breaker instanceof Player)) {
return; return;
} }
if (! FactionsBlockListener.playerCanBuildDestroyBlock((Player) breaker, event.getEntity().getLocation(), "remove paintings", false)) { if (!FactionsBlockListener.playerCanBuildDestroyBlock((Player) breaker, event.getEntity().getLocation(), "remove paintings", false)) {
event.setCancelled(true); event.setCancelled(true);
} }
} }
@EventHandler (priority = EventPriority.NORMAL, ignoreCancelled = true) @EventHandler (priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onPaintingPlace(HangingPlaceEvent event) { public void onPaintingPlace(HangingPlaceEvent event) {
if (! FactionsBlockListener.playerCanBuildDestroyBlock(event.getPlayer(), event.getBlock().getLocation(), "place paintings", false)) { if (!FactionsBlockListener.playerCanBuildDestroyBlock(event.getPlayer(), event.getBlock().getLocation(), "place paintings", false)) {
event.setCancelled(true); event.setCancelled(true);
// Fix: update player's inventory to avoid items glitches // Fix: update player's inventory to avoid items glitches
event.getPlayer().updateInventory(); event.getPlayer().updateInventory();
@ -627,7 +627,7 @@ public class FactionsEntityListener implements Listener {
Entity entity = event.getEntity(); Entity entity = event.getEntity();
// for now, only interested in Enderman and Wither boss tomfoolery // for now, only interested in Enderman and Wither boss tomfoolery
if (! (entity instanceof Enderman) && ! (entity instanceof Wither)) { if (!(entity instanceof Enderman) && !(entity instanceof Wither)) {
return; return;
} }
@ -640,7 +640,7 @@ public class FactionsEntityListener implements Listener {
} else if (entity instanceof Wither) { } else if (entity instanceof Wither) {
Faction faction = Board.getInstance().getFactionAt(new FLocation(loc)); Faction faction = Board.getInstance().getFactionAt(new FLocation(loc));
// it's a bit crude just using fireball protection, but I'd rather not add in a whole new set of xxxBlockWitherExplosion or whatever // it's a bit crude just using fireball protection, but I'd rather not add in a whole new set of xxxBlockWitherExplosion or whatever
if ((faction.isWilderness() && Conf.wildernessBlockFireballs && ! Conf.worldsNoWildernessProtection.contains(loc.getWorld().getName())) || if ((faction.isWilderness() && Conf.wildernessBlockFireballs && !Conf.worldsNoWildernessProtection.contains(loc.getWorld().getName())) ||
(faction.isNormal() && (faction.hasPlayersOnline() ? Conf.territoryBlockFireballs : Conf.territoryBlockFireballsWhenOffline)) || (faction.isNormal() && (faction.hasPlayersOnline() ? Conf.territoryBlockFireballs : Conf.territoryBlockFireballsWhenOffline)) ||
(faction.isWarZone() && Conf.warZoneBlockFireballs) || (faction.isWarZone() && Conf.warZoneBlockFireballs) ||
faction.isSafeZone()) { faction.isSafeZone()) {
@ -651,7 +651,7 @@ public class FactionsEntityListener implements Listener {
@EventHandler @EventHandler
public void onTravel(PlayerPortalEvent event) { public void onTravel(PlayerPortalEvent event) {
if (! SavageFactions.plugin.getConfig().getBoolean("portals.limit", false)) { if (!SavageFactions.plugin.getConfig().getBoolean("portals.limit", false)) {
return; // Don't do anything if they don't want us to. return; // Don't do anything if they don't want us to.
} }
@ -663,7 +663,7 @@ public class FactionsEntityListener implements Listener {
Faction faction = Board.getInstance().getFactionAt(loc); Faction faction = Board.getInstance().getFactionAt(loc);
if (faction.isWilderness()) { if (faction.isWilderness()) {
return; // We don't care about wilderness. return; // We don't care about wilderness.
} else if (! faction.isNormal() && ! event.getPlayer().isOp()) { } else if (!faction.isNormal() && !event.getPlayer().isOp()) {
// Don't let non ops make portals in safezone or warzone. // Don't let non ops make portals in safezone or warzone.
event.setCancelled(true); event.setCancelled(true);
return; return;
@ -671,7 +671,7 @@ public class FactionsEntityListener implements Listener {
FPlayer fp = FPlayers.getInstance().getByPlayer(event.getPlayer()); FPlayer fp = FPlayers.getInstance().getByPlayer(event.getPlayer());
String mininumRelation = SavageFactions.plugin.getConfig().getString("portals.minimum-relation", "MEMBER"); // Defaults to Neutral if typed wrong. String mininumRelation = SavageFactions.plugin.getConfig().getString("portals.minimum-relation", "MEMBER"); // Defaults to Neutral if typed wrong.
if (! fp.getFaction().getRelationTo(faction).isAtLeast(Relation.fromString(mininumRelation))) { if (!fp.getFaction().getRelationTo(faction).isAtLeast(Relation.fromString(mininumRelation))) {
event.setCancelled(true); event.setCancelled(true);
} }
} }
@ -728,7 +728,7 @@ public class FactionsEntityListener implements Listener {
Player player = event.getPlayer(); Player player = event.getPlayer();
Entity entity = event.getRightClicked(); Entity entity = event.getRightClicked();
if (! FactionsBlockListener.playerCanBuildDestroyBlock(player, entity.getLocation(), "use item frames", false)) { if (!FactionsBlockListener.playerCanBuildDestroyBlock(player, entity.getLocation(), "use item frames", false)) {
event.setCancelled(true); event.setCancelled(true);
} }
} }
@ -743,7 +743,7 @@ public class FactionsEntityListener implements Listener {
return; return;
} }
if (! FactionsBlockListener.playerCanBuildDestroyBlock(event.getPlayer(), entity.getLocation(), "use armor stands", false)) { if (!FactionsBlockListener.playerCanBuildDestroyBlock(event.getPlayer(), entity.getLocation(), "use armor stands", false)) {
event.setCancelled(true); event.setCancelled(true);
} }
} }

View File

@ -20,7 +20,7 @@ public class FactionsExploitListener implements Listener {
@EventHandler (priority = EventPriority.NORMAL, ignoreCancelled = true) @EventHandler (priority = EventPriority.NORMAL, ignoreCancelled = true)
public void obsidianGenerator(BlockFromToEvent event) { public void obsidianGenerator(BlockFromToEvent event) {
if (! Conf.handleExploitObsidianGenerators) { if (!Conf.handleExploitObsidianGenerators) {
return; return;
} }
@ -35,7 +35,7 @@ public class FactionsExploitListener implements Listener {
@EventHandler (priority = EventPriority.NORMAL, ignoreCancelled = true) @EventHandler (priority = EventPriority.NORMAL, ignoreCancelled = true)
public void enderPearlTeleport(PlayerTeleportEvent event) { public void enderPearlTeleport(PlayerTeleportEvent event) {
if (! Conf.handleExploitEnderPearlClipping) { if (!Conf.handleExploitEnderPearlClipping) {
return; return;
} }
if (event.getCause() != PlayerTeleportEvent.TeleportCause.ENDER_PEARL) { if (event.getCause() != PlayerTeleportEvent.TeleportCause.ENDER_PEARL) {

View File

@ -85,8 +85,8 @@ public class FactionsPlayerListener implements Listener {
Relation rel = myFaction.getRelationTo(otherFaction); Relation rel = myFaction.getRelationTo(otherFaction);
// Also cancel if player doesn't have ownership rights for this claim // Also cancel if player doesn't have ownership rights for this claim
if (Conf.ownedAreasEnabled && myFaction == otherFaction && ! myFaction.playerHasOwnershipRights(me, loc)) { if (Conf.ownedAreasEnabled && myFaction == otherFaction && !myFaction.playerHasOwnershipRights(me, loc)) {
if (! justCheck) { if (!justCheck) {
me.msg("<b>You can't use that in this territory, it is owned by: " + otherFaction.getOwnerListString(loc)); me.msg("<b>You can't use that in this territory, it is owned by: " + otherFaction.getOwnerListString(loc));
} }
return false; return false;
@ -96,41 +96,41 @@ public class FactionsPlayerListener implements Listener {
} }
if (otherFaction.hasPlayersOnline()) { if (otherFaction.hasPlayersOnline()) {
if (! Conf.territoryDenyUseageMaterials.contains(material)) { if (!Conf.territoryDenyUseageMaterials.contains(material)) {
return true; // Item isn't one we're preventing for online factions. return true; // Item isn't one we're preventing for online factions.
} }
} else { } else {
if (! Conf.territoryDenyUseageMaterialsWhenOffline.contains(material)) { if (!Conf.territoryDenyUseageMaterialsWhenOffline.contains(material)) {
return true; // Item isn't one we're preventing for offline factions. return true; // Item isn't one we're preventing for offline factions.
} }
} }
if (otherFaction.isWilderness()) { if (otherFaction.isWilderness()) {
if (! Conf.wildernessDenyUseage || Conf.worldsNoWildernessProtection.contains(location.getWorld().getName())) { if (!Conf.wildernessDenyUseage || Conf.worldsNoWildernessProtection.contains(location.getWorld().getName())) {
return true; // This is not faction territory. Use whatever you like here. return true; // This is not faction territory. Use whatever you like here.
} }
if (! justCheck) { if (!justCheck) {
me.msg(TL.PLAYER_USE_WILDERNESS, TextUtil.getMaterialName(material)); me.msg(TL.PLAYER_USE_WILDERNESS, TextUtil.getMaterialName(material));
} }
return false; return false;
} else if (otherFaction.isSafeZone()) { } else if (otherFaction.isSafeZone()) {
if (! Conf.safeZoneDenyUseage || Permission.MANAGE_SAFE_ZONE.has(player)) { if (!Conf.safeZoneDenyUseage || Permission.MANAGE_SAFE_ZONE.has(player)) {
return true; return true;
} }
if (! justCheck) { if (!justCheck) {
me.msg(TL.PLAYER_USE_SAFEZONE, TextUtil.getMaterialName(material)); me.msg(TL.PLAYER_USE_SAFEZONE, TextUtil.getMaterialName(material));
} }
return false; return false;
} else if (otherFaction.isWarZone()) { } else if (otherFaction.isWarZone()) {
if (! Conf.warZoneDenyUseage || Permission.MANAGE_WAR_ZONE.has(player)) { if (!Conf.warZoneDenyUseage || Permission.MANAGE_WAR_ZONE.has(player)) {
return true; return true;
} }
if (! justCheck) { if (!justCheck) {
me.msg(TL.PLAYER_USE_WARZONE, TextUtil.getMaterialName(material)); me.msg(TL.PLAYER_USE_WARZONE, TextUtil.getMaterialName(material));
} }
@ -139,7 +139,7 @@ public class FactionsPlayerListener implements Listener {
// Cancel if we are not in our own territory // Cancel if we are not in our own territory
if (rel.confDenyUseage()) { if (rel.confDenyUseage()) {
if (! justCheck) { if (!justCheck) {
me.msg(TL.PLAYER_USE_TERRITORY, TextUtil.getMaterialName(material), otherFaction.getTag(myFaction)); me.msg(TL.PLAYER_USE_TERRITORY, TextUtil.getMaterialName(material), otherFaction.getTag(myFaction));
} }
@ -149,9 +149,9 @@ public class FactionsPlayerListener implements Listener {
Access access = otherFaction.getAccess(me, PermissableAction.ITEM); Access access = otherFaction.getAccess(me, PermissableAction.ITEM);
if (access != null && access != Access.UNDEFINED) { if (access != null && access != Access.UNDEFINED) {
// TODO: Update this once new access values are added other than just allow / deny. // TODO: Update this once new access values are added other than just allow / deny.
if ((myFaction.getOwnerListString(loc) != null && ! myFaction.getOwnerListString(loc).isEmpty() && myFaction.getOwnerListString(loc).contains(player.getName()))) { if ((myFaction.getOwnerListString(loc) != null && !myFaction.getOwnerListString(loc).isEmpty() && myFaction.getOwnerListString(loc).contains(player.getName()))) {
return true; return true;
} else if (myFaction.getOwnerListString(loc) != null && ! myFaction.getOwnerListString(loc).isEmpty() && ! myFaction.getOwnerListString(loc).contains(player.getName())) { } else if (myFaction.getOwnerListString(loc) != null && !myFaction.getOwnerListString(loc).isEmpty() && !myFaction.getOwnerListString(loc).contains(player.getName())) {
me.msg("<b>You can't use items in this territory, it is owned by: " + myFaction.getOwnerListString(loc)); me.msg("<b>You can't use items in this territory, it is owned by: " + myFaction.getOwnerListString(loc));
return false; return false;
} else if (access == Access.DENY) { } else if (access == Access.DENY) {
@ -182,7 +182,7 @@ public class FactionsPlayerListener implements Listener {
// no door/chest/whatever protection in wilderness, war zones, or safe zones // no door/chest/whatever protection in wilderness, war zones, or safe zones
if (! otherFaction.isNormal()) { if (!otherFaction.isNormal()) {
return true; return true;
} }
@ -190,7 +190,7 @@ public class FactionsPlayerListener implements Listener {
return true; return true;
} }
if (! rel.isMember() || ! otherFaction.playerHasOwnershipRights(me, loc) && player.getItemInHand().getType() != null) { if (!rel.isMember() || !otherFaction.playerHasOwnershipRights(me, loc) && player.getItemInHand().getType() != null) {
if (player.getItemInHand().getType().toString().toUpperCase().contains("DOOR")) { if (player.getItemInHand().getType().toString().toUpperCase().contains("DOOR")) {
return false; return false;
@ -284,11 +284,11 @@ public class FactionsPlayerListener implements Listener {
// We only care about some material types. // We only care about some material types.
if (otherFaction.hasPlayersOnline()) { if (otherFaction.hasPlayersOnline()) {
if (! Conf.territoryProtectedMaterials.contains(material)) { if (!Conf.territoryProtectedMaterials.contains(material)) {
return true; return true;
} }
} else { } else {
if (! Conf.territoryProtectedMaterialsWhenOffline.contains(material)) { if (!Conf.territoryProtectedMaterialsWhenOffline.contains(material)) {
return true; return true;
} }
} }
@ -309,7 +309,7 @@ public class FactionsPlayerListener implements Listener {
if (doTerritoryEnemyProtectedCheck) { if (doTerritoryEnemyProtectedCheck) {
// You may use any block unless it is another faction's territory... // You may use any block unless it is another faction's territory...
if (rel.isNeutral() || (rel.isEnemy() && Conf.territoryEnemyProtectMaterials) || (rel.isAlly() && Conf.territoryAllyProtectMaterials) || (rel.isTruce() && Conf.territoryTruceProtectMaterials)) { if (rel.isNeutral() || (rel.isEnemy() && Conf.territoryEnemyProtectMaterials) || (rel.isAlly() && Conf.territoryAllyProtectMaterials) || (rel.isTruce() && Conf.territoryTruceProtectMaterials)) {
if (! justCheck) { if (!justCheck) {
me.msg(TL.PLAYER_USE_TERRITORY, (material == SavageFactions.plugin.SOIL ? "trample " : "use ") + TextUtil.getMaterialName(material), otherFaction.getTag(myFaction)); me.msg(TL.PLAYER_USE_TERRITORY, (material == SavageFactions.plugin.SOIL ? "trample " : "use ") + TextUtil.getMaterialName(material), otherFaction.getTag(myFaction));
} }
return false; return false;
@ -319,9 +319,9 @@ public class FactionsPlayerListener implements Listener {
if (access != Access.ALLOW && me.getRole() != Role.LEADER) { if (access != Access.ALLOW && me.getRole() != Role.LEADER) {
// TODO: Update this once new access values are added other than just allow / deny. // TODO: Update this once new access values are added other than just allow / deny.
if ((myFaction.getOwnerListString(loc) != null && ! myFaction.getOwnerListString(loc).isEmpty() && myFaction.getOwnerListString(loc).contains(player.getName()))) { if ((myFaction.getOwnerListString(loc) != null && !myFaction.getOwnerListString(loc).isEmpty() && myFaction.getOwnerListString(loc).contains(player.getName()))) {
return true; return true;
} else if (myFaction.getOwnerListString(loc) != null && ! myFaction.getOwnerListString(loc).isEmpty() && ! myFaction.getOwnerListString(loc).contains(player.getName())) { } else if (myFaction.getOwnerListString(loc) != null && !myFaction.getOwnerListString(loc).isEmpty() && !myFaction.getOwnerListString(loc).contains(player.getName())) {
me.msg("<b>You can't " + action + " in this territory, it is owned by: " + myFaction.getOwnerListString(loc)); me.msg("<b>You can't " + action + " in this territory, it is owned by: " + myFaction.getOwnerListString(loc));
return false; return false;
} else if (access == Access.DENY) { } else if (access == Access.DENY) {
@ -350,8 +350,8 @@ public class FactionsPlayerListener implements Listener {
} }
if (me.hasFaction() && if (me.hasFaction() &&
! me.isAdminBypassing() && !me.isAdminBypassing() &&
! Conf.permanentFactionMemberDenyCommands.isEmpty() && !Conf.permanentFactionMemberDenyCommands.isEmpty() &&
me.getFaction().isPermanent() && me.getFaction().isPermanent() &&
isCommandInList(fullCmd, shortCmd, Conf.permanentFactionMemberDenyCommands.iterator())) { isCommandInList(fullCmd, shortCmd, Conf.permanentFactionMemberDenyCommands.iterator())) {
me.msg(TL.PLAYER_COMMAND_PERMANENT, fullCmd); me.msg(TL.PLAYER_COMMAND_PERMANENT, fullCmd);
@ -359,28 +359,28 @@ public class FactionsPlayerListener implements Listener {
} }
Faction at = Board.getInstance().getFactionAt(new FLocation(player.getLocation())); Faction at = Board.getInstance().getFactionAt(new FLocation(player.getLocation()));
if (at.isWilderness() && ! Conf.wildernessDenyCommands.isEmpty() && ! me.isAdminBypassing() && isCommandInList(fullCmd, shortCmd, Conf.wildernessDenyCommands.iterator())) { if (at.isWilderness() && !Conf.wildernessDenyCommands.isEmpty() && !me.isAdminBypassing() && isCommandInList(fullCmd, shortCmd, Conf.wildernessDenyCommands.iterator())) {
me.msg(TL.PLAYER_COMMAND_WILDERNESS, fullCmd); me.msg(TL.PLAYER_COMMAND_WILDERNESS, fullCmd);
return true; return true;
} }
Relation rel = at.getRelationTo(me); Relation rel = at.getRelationTo(me);
if (at.isNormal() && rel.isAlly() && ! Conf.territoryAllyDenyCommands.isEmpty() && ! me.isAdminBypassing() && isCommandInList(fullCmd, shortCmd, Conf.territoryAllyDenyCommands.iterator())) { if (at.isNormal() && rel.isAlly() && !Conf.territoryAllyDenyCommands.isEmpty() && !me.isAdminBypassing() && isCommandInList(fullCmd, shortCmd, Conf.territoryAllyDenyCommands.iterator())) {
me.msg(TL.PLAYER_COMMAND_ALLY, fullCmd); me.msg(TL.PLAYER_COMMAND_ALLY, fullCmd);
return false; return false;
} }
if (at.isNormal() && rel.isNeutral() && ! Conf.territoryNeutralDenyCommands.isEmpty() && ! me.isAdminBypassing() && isCommandInList(fullCmd, shortCmd, Conf.territoryNeutralDenyCommands.iterator())) { if (at.isNormal() && rel.isNeutral() && !Conf.territoryNeutralDenyCommands.isEmpty() && !me.isAdminBypassing() && isCommandInList(fullCmd, shortCmd, Conf.territoryNeutralDenyCommands.iterator())) {
me.msg(TL.PLAYER_COMMAND_NEUTRAL, fullCmd); me.msg(TL.PLAYER_COMMAND_NEUTRAL, fullCmd);
return true; return true;
} }
if (at.isNormal() && rel.isEnemy() && ! Conf.territoryEnemyDenyCommands.isEmpty() && ! me.isAdminBypassing() && isCommandInList(fullCmd, shortCmd, Conf.territoryEnemyDenyCommands.iterator())) { if (at.isNormal() && rel.isEnemy() && !Conf.territoryEnemyDenyCommands.isEmpty() && !me.isAdminBypassing() && isCommandInList(fullCmd, shortCmd, Conf.territoryEnemyDenyCommands.iterator())) {
me.msg(TL.PLAYER_COMMAND_ENEMY, fullCmd); me.msg(TL.PLAYER_COMMAND_ENEMY, fullCmd);
return true; return true;
} }
if (at.isWarZone() && ! Conf.warzoneDenyCommands.isEmpty() && ! me.isAdminBypassing() && isCommandInList(fullCmd, shortCmd, Conf.warzoneDenyCommands.iterator())) { if (at.isWarZone() && !Conf.warzoneDenyCommands.isEmpty() && !me.isAdminBypassing() && isCommandInList(fullCmd, shortCmd, Conf.warzoneDenyCommands.iterator())) {
me.msg(TL.PLAYER_COMMAND_WARZONE, fullCmd); me.msg(TL.PLAYER_COMMAND_WARZONE, fullCmd);
return true; return true;
} }
@ -440,7 +440,7 @@ public class FactionsPlayerListener implements Listener {
} }
Faction myFaction = me.getFaction(); Faction myFaction = me.getFaction();
if (! myFaction.isWilderness()) { if (!myFaction.isWilderness()) {
for (FPlayer other : myFaction.getFPlayersWhereOnline(true)) { for (FPlayer other : myFaction.getFPlayersWhereOnline(true)) {
if (other != me && other.isMonitoringJoins()) { if (other != me && other.isMonitoringJoins()) {
other.msg(TL.FACTION_LOGIN, me.getName()); other.msg(TL.FACTION_LOGIN, me.getName());
@ -459,19 +459,19 @@ public class FactionsPlayerListener implements Listener {
}, 180L); }, 180L);
if (me.isSpyingChat() && ! player.hasPermission(Permission.CHATSPY.node)) { if (me.isSpyingChat() && !player.hasPermission(Permission.CHATSPY.node)) {
me.setSpyingChat(false); me.setSpyingChat(false);
SavageFactions.plugin.log(Level.INFO, "Found %s spying chat without permission on login. Disabled their chat spying.", player.getName()); SavageFactions.plugin.log(Level.INFO, "Found %s spying chat without permission on login. Disabled their chat spying.", player.getName());
} }
if (me.isAdminBypassing() && ! player.hasPermission(Permission.BYPASS.node)) { if (me.isAdminBypassing() && !player.hasPermission(Permission.BYPASS.node)) {
me.setIsAdminBypassing(false); me.setIsAdminBypassing(false);
SavageFactions.plugin.log(Level.INFO, "Found %s on admin Bypass without permission on login. Disabled it for them.", player.getName()); SavageFactions.plugin.log(Level.INFO, "Found %s on admin Bypass without permission on login. Disabled it for them.", player.getName());
} }
// If they have the permission, don't let them autoleave. Bad inverted setter :\ // If they have the permission, don't let them autoleave. Bad inverted setter :\
me.setAutoLeave(! player.hasPermission(Permission.AUTO_LEAVE_BYPASS.node)); me.setAutoLeave(!player.hasPermission(Permission.AUTO_LEAVE_BYPASS.node));
me.setTakeFallDamage(true); me.setTakeFallDamage(true);
} }
@ -507,11 +507,11 @@ public class FactionsPlayerListener implements Listener {
} }
Faction myFaction = me.getFaction(); Faction myFaction = me.getFaction();
if (! myFaction.isWilderness()) { if (!myFaction.isWilderness()) {
myFaction.memberLoggedOff(); myFaction.memberLoggedOff();
} }
if (! myFaction.isWilderness()) { if (!myFaction.isWilderness()) {
for (FPlayer player : myFaction.getFPlayersWhereOnline(true)) { for (FPlayer player : myFaction.getFPlayersWhereOnline(true)) {
if (player != me && player.isMonitoringJoins()) { if (player != me && player.isMonitoringJoins()) {
player.msg(TL.FACTION_LOGOUT, me.getName()); player.msg(TL.FACTION_LOGOUT, me.getName());
@ -558,12 +558,12 @@ public class FactionsPlayerListener implements Listener {
public void onInspect(PlayerInteractEvent e) { public void onInspect(PlayerInteractEvent e) {
if (e.getAction().name().contains("BLOCK")) { if (e.getAction().name().contains("BLOCK")) {
FPlayer fplayer = FPlayers.getInstance().getByPlayer(e.getPlayer()); FPlayer fplayer = FPlayers.getInstance().getByPlayer(e.getPlayer());
if (! fplayer.isInspectMode()) { if (!fplayer.isInspectMode()) {
return; return;
} }
e.setCancelled(true); e.setCancelled(true);
if (! fplayer.isAdminBypassing()) { if (!fplayer.isAdminBypassing()) {
if (! fplayer.hasFaction()) { if (!fplayer.hasFaction()) {
fplayer.setInspectMode(false); fplayer.setInspectMode(false);
fplayer.msg(TL.COMMAND_INSPECT_DISABLED_NOFAC); fplayer.msg(TL.COMMAND_INSPECT_DISABLED_NOFAC);
return; return;
@ -664,8 +664,8 @@ public class FactionsPlayerListener implements Listener {
title = parseAllPlaceholders(title, factionTo, player); title = parseAllPlaceholders(title, factionTo, player);
String subTitle = SavageFactions.plugin.getConfig().getString("Title.Format.Subtitle").replace("{Description}", factionTo.getDescription()).replace("{Faction}", factionTo.getColorTo(me) + factionTo.getTag()); String subTitle = SavageFactions.plugin.getConfig().getString("Title.Format.Subtitle").replace("{Description}", factionTo.getDescription()).replace("{Faction}", factionTo.getColorTo(me) + factionTo.getTag());
subTitle = parseAllPlaceholders(subTitle, factionTo, player); subTitle = parseAllPlaceholders(subTitle, factionTo, player);
if (! SavageFactions.plugin.mc17) { if (!SavageFactions.plugin.mc17) {
if (! SavageFactions.plugin.mc18) { if (!SavageFactions.plugin.mc18) {
me.getPlayer().sendTitle(SavageFactions.plugin.color(title), SavageFactions.plugin.color(subTitle), SavageFactions.plugin.getConfig().getInt("Title.Options.FadeInTime"), me.getPlayer().sendTitle(SavageFactions.plugin.color(title), SavageFactions.plugin.color(subTitle), SavageFactions.plugin.getConfig().getInt("Title.Options.FadeInTime"),
SavageFactions.plugin.getConfig().getInt("Title.Options.ShowTime"), SavageFactions.plugin.getConfig().getInt("Title.Options.ShowTime"),
SavageFactions.plugin.getConfig().getInt("Title.Options.FadeOutTime")); SavageFactions.plugin.getConfig().getInt("Title.Options.FadeOutTime"));
@ -678,13 +678,13 @@ public class FactionsPlayerListener implements Listener {
} }
if (! SavageFactions.plugin.factionsFlight) { if (!SavageFactions.plugin.factionsFlight) {
return; return;
} }
// enable fly :) // enable fly :)
if (me.hasFaction() && ! me.isFlying()) { if (me.hasFaction() && !me.isFlying()) {
if (factionTo == me.getFaction()) { if (factionTo == me.getFaction()) {
enableFly(me); enableFly(me);
} }
@ -696,7 +696,7 @@ public class FactionsPlayerListener implements Listener {
(relationTo == Relation.ENEMY && me.canflyinEnemy()) || (relationTo == Relation.ENEMY && me.canflyinEnemy()) ||
(relationTo == Relation.ALLY && me.canflyinAlly()) || (relationTo == Relation.ALLY && me.canflyinAlly()) ||
(relationTo == Relation.TRUCE && me.canflyinTruce()) || (relationTo == Relation.TRUCE && me.canflyinTruce()) ||
(relationTo == Relation.NEUTRAL && me.canflyinNeutral() && ! isSystemFaction(factionTo))) { (relationTo == Relation.NEUTRAL && me.canflyinNeutral() && !isSystemFaction(factionTo))) {
enableFly(me); enableFly(me);
} }
@ -718,15 +718,15 @@ public class FactionsPlayerListener implements Listener {
String ownersTo = myFaction.getOwnerListString(to); String ownersTo = myFaction.getOwnerListString(to);
if (changedFaction) { if (changedFaction) {
me.sendFactionHereMessage(factionFrom); me.sendFactionHereMessage(factionFrom);
if (Conf.ownedAreasEnabled && Conf.ownedMessageOnBorder && myFaction == factionTo && ! ownersTo.isEmpty()) { if (Conf.ownedAreasEnabled && Conf.ownedMessageOnBorder && myFaction == factionTo && !ownersTo.isEmpty()) {
me.sendMessage(TL.GENERIC_OWNERS.format(ownersTo)); me.sendMessage(TL.GENERIC_OWNERS.format(ownersTo));
} }
} else if (Conf.ownedAreasEnabled && Conf.ownedMessageInsideTerritory && myFaction == factionTo && ! myFaction.isWilderness()) { } else if (Conf.ownedAreasEnabled && Conf.ownedMessageInsideTerritory && myFaction == factionTo && !myFaction.isWilderness()) {
String ownersFrom = myFaction.getOwnerListString(from); String ownersFrom = myFaction.getOwnerListString(from);
if (Conf.ownedMessageByChunk || ! ownersFrom.equals(ownersTo)) { if (Conf.ownedMessageByChunk || !ownersFrom.equals(ownersTo)) {
if (! ownersTo.isEmpty()) { if (!ownersTo.isEmpty()) {
me.sendMessage(TL.GENERIC_OWNERS.format(ownersTo)); me.sendMessage(TL.GENERIC_OWNERS.format(ownersTo));
} else if (! TL.GENERIC_PUBLICLAND.toString().isEmpty()) { } else if (!TL.GENERIC_PUBLICLAND.toString().isEmpty()) {
me.sendMessage(TL.GENERIC_PUBLICLAND.toString()); me.sendMessage(TL.GENERIC_PUBLICLAND.toString());
} }
} }
@ -736,19 +736,19 @@ public class FactionsPlayerListener implements Listener {
if (me.getAutoClaimFor() != null) { if (me.getAutoClaimFor() != null) {
me.attemptClaim(me.getAutoClaimFor(), event.getTo(), true); me.attemptClaim(me.getAutoClaimFor(), event.getTo(), true);
} 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);
} else { } else {
if (! Board.getInstance().getFactionAt(to).isSafeZone()) { if (!Board.getInstance().getFactionAt(to).isSafeZone()) {
Board.getInstance().setFactionAt(Factions.getInstance().getSafeZone(), to); Board.getInstance().setFactionAt(Factions.getInstance().getSafeZone(), to);
me.msg(TL.PLAYER_SAFEAUTO); me.msg(TL.PLAYER_SAFEAUTO);
} }
} }
} else if (me.isAutoWarClaimEnabled()) { } else if (me.isAutoWarClaimEnabled()) {
if (! Permission.MANAGE_WAR_ZONE.has(player)) { if (!Permission.MANAGE_WAR_ZONE.has(player)) {
me.setIsAutoWarClaimEnabled(false); me.setIsAutoWarClaimEnabled(false);
} else { } else {
if (! Board.getInstance().getFactionAt(to).isWarZone()) { if (!Board.getInstance().getFactionAt(to).isWarZone()) {
Board.getInstance().setFactionAt(Factions.getInstance().getWarZone(), to); Board.getInstance().setFactionAt(Factions.getInstance().getWarZone(), to);
me.msg(TL.PLAYER_WARAUTO); me.msg(TL.PLAYER_WARAUTO);
} }
@ -798,7 +798,7 @@ public class FactionsPlayerListener implements Listener {
return; // clicked in air, apparently return; // clicked in air, apparently
} }
if (! canPlayerUseBlock(player, block, false)) { if (!canPlayerUseBlock(player, block, false)) {
event.setCancelled(true); event.setCancelled(true);
if (Conf.handleExploitInteractionSpam) { if (Conf.handleExploitInteractionSpam) {
String name = player.getName(); String name = player.getName();
@ -821,7 +821,7 @@ public class FactionsPlayerListener implements Listener {
return; // only interested on right-clicks for below return; // only interested on right-clicks for below
} }
if (! playerCanUseItemHere(player, block.getLocation(), event.getMaterial(), false)) { if (!playerCanUseItemHere(player, block.getLocation(), event.getMaterial(), false)) {
event.setCancelled(true); event.setCancelled(true);
} }
} }
@ -836,7 +836,7 @@ public class FactionsPlayerListener implements Listener {
if (Conf.homesEnabled && if (Conf.homesEnabled &&
Conf.homesTeleportToOnDeath && Conf.homesTeleportToOnDeath &&
home != null && home != null &&
(Conf.homesRespawnFromNoPowerLossWorlds || ! Conf.worldsNoPowerLoss.contains(event.getPlayer().getWorld().getName()))) { (Conf.homesRespawnFromNoPowerLossWorlds || !Conf.worldsNoPowerLoss.contains(event.getPlayer().getWorld().getName()))) {
event.setRespawnLocation(home); event.setRespawnLocation(home);
} }
} }
@ -848,7 +848,7 @@ public class FactionsPlayerListener implements Listener {
Block block = event.getBlockClicked(); Block block = event.getBlockClicked();
Player player = event.getPlayer(); Player player = event.getPlayer();
if (! playerCanUseItemHere(player, block.getLocation(), event.getBucket(), false)) { if (!playerCanUseItemHere(player, block.getLocation(), event.getBucket(), false)) {
event.setCancelled(true); event.setCancelled(true);
} }
} }
@ -858,7 +858,7 @@ public class FactionsPlayerListener implements Listener {
Block block = event.getBlockClicked(); Block block = event.getBlockClicked();
Player player = event.getPlayer(); Player player = event.getPlayer();
if (! playerCanUseItemHere(player, block.getLocation(), event.getBucket(), false)) { if (!playerCanUseItemHere(player, block.getLocation(), event.getBucket(), false)) {
event.setCancelled(true); event.setCancelled(true);
} }
} }

View File

@ -62,7 +62,7 @@ public class BufferedObjective {
} }
public void setTitle(String title) { public void setTitle(String title) {
if (this.title == null || ! this.title.equals(title)) { if (this.title == null || !this.title.equals(title)) {
this.title = title; this.title = title;
requiresUpdate = true; requiresUpdate = true;
} }
@ -88,7 +88,7 @@ public class BufferedObjective {
} }
content = ChatColor.translateAlternateColorCodes('&', content); content = ChatColor.translateAlternateColorCodes('&', content);
if (contents.get(lineNumber) == null || ! contents.get(lineNumber).equals(content)) { if (contents.get(lineNumber) == null || !contents.get(lineNumber).equals(content)) {
contents.put(lineNumber, content); contents.put(lineNumber, content);
requiresUpdate = true; requiresUpdate = true;
} }
@ -102,7 +102,7 @@ public class BufferedObjective {
} }
public void flip() { public void flip() {
if (! requiresUpdate) { if (!requiresUpdate) {
return; return;
} }
requiresUpdate = false; requiresUpdate = false;

View File

@ -79,7 +79,7 @@ public class FScoreboard {
} }
public void setSidebarVisibility(boolean visible) { public void setSidebarVisibility(boolean visible) {
if (! isSupportedByServer()) { if (!isSupportedByServer()) {
return; return;
} }
@ -87,7 +87,7 @@ public class FScoreboard {
} }
public void setDefaultSidebar(final FSidebarProvider provider, int updateInterval) { public void setDefaultSidebar(final FSidebarProvider provider, int updateInterval) {
if (! isSupportedByServer()) { if (!isSupportedByServer()) {
return; return;
} }
@ -113,7 +113,7 @@ public class FScoreboard {
} }
public void setTemporarySidebar(final FSidebarProvider provider) { public void setTemporarySidebar(final FSidebarProvider provider) {
if (! isSupportedByServer()) { if (!isSupportedByServer()) {
return; return;
} }

View File

@ -30,7 +30,7 @@ public class FTeamWrapper {
} }
public static void applyUpdatesLater(final Faction faction) { public static void applyUpdatesLater(final Faction faction) {
if (! FScoreboard.isSupportedByServer()) { if (!FScoreboard.isSupportedByServer()) {
return; return;
} }
@ -38,7 +38,7 @@ public class FTeamWrapper {
return; return;
} }
if (! SavageFactions.plugin.getConfig().getBoolean("scoreboard.default-prefixes", false)) { if (!SavageFactions.plugin.getConfig().getBoolean("scoreboard.default-prefixes", false)) {
return; return;
} }
@ -55,7 +55,7 @@ public class FTeamWrapper {
} }
public static void applyUpdates(Faction faction) { public static void applyUpdates(Faction faction) {
if (! FScoreboard.isSupportedByServer()) { if (!FScoreboard.isSupportedByServer()) {
return; return;
} }
@ -63,7 +63,7 @@ public class FTeamWrapper {
return; return;
} }
if (! SavageFactions.plugin.getConfig().getBoolean("scoreboard.default-prefixes", false)) { if (!SavageFactions.plugin.getConfig().getBoolean("scoreboard.default-prefixes", false)) {
return; return;
} }
@ -88,14 +88,14 @@ public class FTeamWrapper {
} }
for (OfflinePlayer player : wrapper.getPlayers()) { for (OfflinePlayer player : wrapper.getPlayers()) {
if (! player.isOnline() || ! factionMembers.contains(FPlayers.getInstance().getByOfflinePlayer(player))) { if (!player.isOnline() || !factionMembers.contains(FPlayers.getInstance().getByOfflinePlayer(player))) {
// Player is offline or no longer in faction // Player is offline or no longer in faction
wrapper.removePlayer(player); wrapper.removePlayer(player);
} }
} }
for (FPlayer fmember : factionMembers) { for (FPlayer fmember : factionMembers) {
if (! fmember.isOnline()) { if (!fmember.isOnline()) {
continue; continue;
} }
@ -107,11 +107,11 @@ public class FTeamWrapper {
} }
public static void updatePrefixes(Faction faction) { public static void updatePrefixes(Faction faction) {
if (! FScoreboard.isSupportedByServer()) { if (!FScoreboard.isSupportedByServer()) {
return; return;
} }
if (! wrappers.containsKey(faction)) { if (!wrappers.containsKey(faction)) {
applyUpdates(faction); applyUpdates(faction);
} else { } else {
wrappers.get(faction).updatePrefixes(); wrappers.get(faction).updatePrefixes();
@ -119,7 +119,7 @@ public class FTeamWrapper {
} }
protected static void track(FScoreboard fboard) { protected static void track(FScoreboard fboard) {
if (! FScoreboard.isSupportedByServer()) { if (!FScoreboard.isSupportedByServer()) {
return; return;
} }
tracking.add(fboard); tracking.add(fboard);
@ -129,7 +129,7 @@ public class FTeamWrapper {
} }
protected static void untrack(FScoreboard fboard) { protected static void untrack(FScoreboard fboard) {
if (! FScoreboard.isSupportedByServer()) { if (!FScoreboard.isSupportedByServer()) {
return; return;
} }
tracking.remove(fboard); tracking.remove(fboard);
@ -174,7 +174,7 @@ public class FTeamWrapper {
} }
prefix = prefix.replace("{relationcolor}", faction.getRelationTo(fplayer).getColor().toString()); prefix = prefix.replace("{relationcolor}", faction.getRelationTo(fplayer).getColor().toString());
prefix = prefix.replace("{faction}", faction.getTag().substring(0, Math.min("{faction}".length() + 16 - prefix.length(), faction.getTag().length()))); prefix = prefix.replace("{faction}", faction.getTag().substring(0, Math.min("{faction}".length() + 16 - prefix.length(), faction.getTag().length())));
if (team.getPrefix() == null || ! team.getPrefix().equals(prefix)) { if (team.getPrefix() == null || !team.getPrefix().equals(prefix)) {
team.setPrefix(prefix); team.setPrefix(prefix);
} }
} }

View File

@ -135,7 +135,7 @@ public enum Role implements Permissable {
itemMeta.setDisplayName(displayName); itemMeta.setDisplayName(displayName);
itemMeta.setLore(lore); itemMeta.setLore(lore);
if (! SavageFactions.plugin.mc17) { if (!SavageFactions.plugin.mc17) {
itemMeta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES); itemMeta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES);
} }

View File

@ -29,7 +29,7 @@ public class AutoLeaveProcessTask extends BukkitRunnable {
return; return;
} }
if (! readyToGo) { if (!readyToGo) {
return; return;
} }
// this is set so it only does one iteration at a time, no matter how frequently the timer fires // this is set so it only does one iteration at a time, no matter how frequently the timer fires
@ -49,7 +49,7 @@ public class AutoLeaveProcessTask extends BukkitRunnable {
FPlayer fplayer = iterator.next(); FPlayer fplayer = iterator.next();
// Check if they should be exempt from this. // Check if they should be exempt from this.
if (! fplayer.willAutoLeave()) { if (!fplayer.willAutoLeave()) {
SavageFactions.plugin.debug(Level.INFO, fplayer.getName() + " was going to be auto-removed but was set not to."); SavageFactions.plugin.debug(Level.INFO, fplayer.getName() + " was going to be auto-removed but was set not to.");
continue; continue;
} }

View File

@ -13,7 +13,7 @@ public class AutoLeaveTask implements Runnable {
} }
public synchronized void run() { public synchronized void run() {
if (task != null && ! task.isFinished()) { if (task != null && !task.isFinished()) {
return; return;
} }

View File

@ -40,10 +40,10 @@ public final class EnumTypeAdapter<T extends Enum<T>> extends TypeAdapter<T> {
@SuppressWarnings ({"rawtypes", "unchecked"}) @SuppressWarnings ({"rawtypes", "unchecked"})
public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) { public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) {
Class<? super T> rawType = typeToken.getRawType(); Class<? super T> rawType = typeToken.getRawType();
if (! Enum.class.isAssignableFrom(rawType) || rawType == Enum.class) { if (!Enum.class.isAssignableFrom(rawType) || rawType == Enum.class) {
return null; return null;
} }
if (! rawType.isEnum()) { if (!rawType.isEnum()) {
rawType = rawType.getSuperclass(); // handle anonymous subclasses rawType = rawType.getSuperclass(); // handle anonymous subclasses
} }
return (TypeAdapter<T>) new EnumTypeAdapter(rawType); return (TypeAdapter<T>) new EnumTypeAdapter(rawType);

View File

@ -86,7 +86,7 @@ public class MapFLocToStringSetTypeAdapter implements JsonDeserializer<Map<FLoca
nameArray.add(nameElement); nameArray.add(nameElement);
} }
if (! obj.has(locWorld)) { if (!obj.has(locWorld)) {
obj.add(locWorld, new JsonObject()); obj.add(locWorld, new JsonObject());
} }

View File

@ -23,7 +23,7 @@ public class MiscUtil {
new HashSet<>(Arrays.asList("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z")); new HashSet<>(Arrays.asList("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"));
public static EntityType creatureTypeFromEntity(Entity entity) { public static EntityType creatureTypeFromEntity(Entity entity) {
if (! (entity instanceof Creature)) { if (!(entity instanceof Creature)) {
return null; return null;
} }
@ -76,7 +76,7 @@ public class MiscUtil {
} }
for (char c : str.toCharArray()) { for (char c : str.toCharArray()) {
if (! substanceChars.contains(String.valueOf(c))) { if (!substanceChars.contains(String.valueOf(c))) {
errors.add(SavageFactions.plugin.txt.parse(TL.GENERIC_FACTIONTAG_ALPHANUMERIC.toString(), c)); errors.add(SavageFactions.plugin.txt.parse(TL.GENERIC_FACTIONTAG_ALPHANUMERIC.toString(), c));
} }
} }

View File

@ -422,7 +422,7 @@ public enum ParticleEffect {
*/ */
public static ParticleEffect fromName(String name) { public static ParticleEffect fromName(String name) {
for (Entry<String, ParticleEffect> entry : NAME_MAP.entrySet()) { for (Entry<String, ParticleEffect> entry : NAME_MAP.entrySet()) {
if (! entry.getKey().equalsIgnoreCase(name)) { if (!entry.getKey().equalsIgnoreCase(name)) {
continue; continue;
} }
return entry.getValue(); return entry.getValue();
@ -467,7 +467,7 @@ public enum ParticleEffect {
String world = location.getWorld().getName(); String world = location.getWorld().getName();
for (Player player : players) { for (Player player : players) {
Location playerLocation = player.getLocation(); Location playerLocation = player.getLocation();
if (! world.equals(playerLocation.getWorld().getName()) || playerLocation.distanceSquared(location) < 65536) { if (!world.equals(playerLocation.getWorld().getName()) || playerLocation.distanceSquared(location) < 65536) {
continue; continue;
} }
return true; return true;
@ -562,13 +562,13 @@ public enum ParticleEffect {
* @see ParticlePacket#sendTo(Location, double) * @see ParticlePacket#sendTo(Location, double)
*/ */
public void display(float offsetX, float offsetY, float offsetZ, float speed, int amount, Location center, double range) throws ParticleVersionException, ParticleDataException, IllegalArgumentException { public void display(float offsetX, float offsetY, float offsetZ, float speed, int amount, Location center, double range) throws ParticleVersionException, ParticleDataException, IllegalArgumentException {
if (! isSupported()) { if (!isSupported()) {
throw new ParticleVersionException("This particle effect is not supported by your server version"); throw new ParticleVersionException("This particle effect is not supported by your server version");
} }
if (hasProperty(ParticleProperty.REQUIRES_DATA)) { if (hasProperty(ParticleProperty.REQUIRES_DATA)) {
throw new ParticleDataException("This particle effect requires additional data"); throw new ParticleDataException("This particle effect requires additional data");
} }
if (hasProperty(ParticleProperty.REQUIRES_WATER) && ! isWater(center)) { if (hasProperty(ParticleProperty.REQUIRES_WATER) && !isWater(center)) {
throw new IllegalArgumentException("There is no water at the center location"); throw new IllegalArgumentException("There is no water at the center location");
} }
new ParticlePacket(this, offsetX, offsetY, offsetZ, speed, amount, range > 256, null).sendTo(center, range); new ParticlePacket(this, offsetX, offsetY, offsetZ, speed, amount, range > 256, null).sendTo(center, range);
@ -591,13 +591,13 @@ public enum ParticleEffect {
* @see ParticlePacket#sendTo(Location, List) * @see ParticlePacket#sendTo(Location, List)
*/ */
public void display(float offsetX, float offsetY, float offsetZ, float speed, int amount, Location center, List<Player> players) throws ParticleVersionException, ParticleDataException, IllegalArgumentException { public void display(float offsetX, float offsetY, float offsetZ, float speed, int amount, Location center, List<Player> players) throws ParticleVersionException, ParticleDataException, IllegalArgumentException {
if (! isSupported()) { if (!isSupported()) {
throw new ParticleVersionException("This particle effect is not supported by your server version"); throw new ParticleVersionException("This particle effect is not supported by your server version");
} }
if (hasProperty(ParticleProperty.REQUIRES_DATA)) { if (hasProperty(ParticleProperty.REQUIRES_DATA)) {
throw new ParticleDataException("This particle effect requires additional data"); throw new ParticleDataException("This particle effect requires additional data");
} }
if (hasProperty(ParticleProperty.REQUIRES_WATER) && ! isWater(center)) { if (hasProperty(ParticleProperty.REQUIRES_WATER) && !isWater(center)) {
throw new IllegalArgumentException("There is no water at the center location"); throw new IllegalArgumentException("There is no water at the center location");
} }
new ParticlePacket(this, offsetX, offsetY, offsetZ, speed, amount, isLongDistance(center, players), null).sendTo(center, players); new ParticlePacket(this, offsetX, offsetY, offsetZ, speed, amount, isLongDistance(center, players), null).sendTo(center, players);
@ -636,16 +636,16 @@ public enum ParticleEffect {
* @see ParticlePacket#sendTo(Location, double) * @see ParticlePacket#sendTo(Location, double)
*/ */
public void display(Vector direction, float speed, Location center, double range) throws ParticleVersionException, ParticleDataException, IllegalArgumentException { public void display(Vector direction, float speed, Location center, double range) throws ParticleVersionException, ParticleDataException, IllegalArgumentException {
if (! isSupported()) { if (!isSupported()) {
throw new ParticleVersionException("This particle effect is not supported by your server version"); throw new ParticleVersionException("This particle effect is not supported by your server version");
} }
if (hasProperty(ParticleProperty.REQUIRES_DATA)) { if (hasProperty(ParticleProperty.REQUIRES_DATA)) {
throw new ParticleDataException("This particle effect requires additional data"); throw new ParticleDataException("This particle effect requires additional data");
} }
if (! hasProperty(ParticleProperty.DIRECTIONAL)) { if (!hasProperty(ParticleProperty.DIRECTIONAL)) {
throw new IllegalArgumentException("This particle effect is not directional"); throw new IllegalArgumentException("This particle effect is not directional");
} }
if (hasProperty(ParticleProperty.REQUIRES_WATER) && ! isWater(center)) { if (hasProperty(ParticleProperty.REQUIRES_WATER) && !isWater(center)) {
throw new IllegalArgumentException("There is no water at the center location"); throw new IllegalArgumentException("There is no water at the center location");
} }
new ParticlePacket(this, direction, speed, range > 256, null).sendTo(center, range); new ParticlePacket(this, direction, speed, range > 256, null).sendTo(center, range);
@ -665,16 +665,16 @@ public enum ParticleEffect {
* @see ParticlePacket#sendTo(Location, List) * @see ParticlePacket#sendTo(Location, List)
*/ */
public void display(Vector direction, float speed, Location center, List<Player> players) throws ParticleVersionException, ParticleDataException, IllegalArgumentException { public void display(Vector direction, float speed, Location center, List<Player> players) throws ParticleVersionException, ParticleDataException, IllegalArgumentException {
if (! isSupported()) { if (!isSupported()) {
throw new ParticleVersionException("This particle effect is not supported by your server version"); throw new ParticleVersionException("This particle effect is not supported by your server version");
} }
if (hasProperty(ParticleProperty.REQUIRES_DATA)) { if (hasProperty(ParticleProperty.REQUIRES_DATA)) {
throw new ParticleDataException("This particle effect requires additional data"); throw new ParticleDataException("This particle effect requires additional data");
} }
if (! hasProperty(ParticleProperty.DIRECTIONAL)) { if (!hasProperty(ParticleProperty.DIRECTIONAL)) {
throw new IllegalArgumentException("This particle effect is not directional"); throw new IllegalArgumentException("This particle effect is not directional");
} }
if (hasProperty(ParticleProperty.REQUIRES_WATER) && ! isWater(center)) { if (hasProperty(ParticleProperty.REQUIRES_WATER) && !isWater(center)) {
throw new IllegalArgumentException("There is no water at the center location"); throw new IllegalArgumentException("There is no water at the center location");
} }
new ParticlePacket(this, direction, speed, isLongDistance(center, players), null).sendTo(center, players); new ParticlePacket(this, direction, speed, isLongDistance(center, players), null).sendTo(center, players);
@ -708,13 +708,13 @@ public enum ParticleEffect {
* @see ParticlePacket#sendTo(Location, double) * @see ParticlePacket#sendTo(Location, double)
*/ */
public void display(ParticleColor color, Location center, double range) throws ParticleVersionException, ParticleColorException { public void display(ParticleColor color, Location center, double range) throws ParticleVersionException, ParticleColorException {
if (! isSupported()) { if (!isSupported()) {
throw new ParticleVersionException("This particle effect is not supported by your server version"); throw new ParticleVersionException("This particle effect is not supported by your server version");
} }
if (! hasProperty(ParticleProperty.COLORABLE)) { if (!hasProperty(ParticleProperty.COLORABLE)) {
throw new ParticleColorException("This particle effect is not colorable"); throw new ParticleColorException("This particle effect is not colorable");
} }
if (! isColorCorrect(this, color)) { if (!isColorCorrect(this, color)) {
throw new ParticleColorException("The particle color type is incorrect"); throw new ParticleColorException("The particle color type is incorrect");
} }
new ParticlePacket(this, color, range > 256).sendTo(center, range); new ParticlePacket(this, color, range > 256).sendTo(center, range);
@ -732,13 +732,13 @@ public enum ParticleEffect {
* @see ParticlePacket#sendTo(Location, List) * @see ParticlePacket#sendTo(Location, List)
*/ */
public void display(ParticleColor color, Location center, List<Player> players) throws ParticleVersionException, ParticleColorException { public void display(ParticleColor color, Location center, List<Player> players) throws ParticleVersionException, ParticleColorException {
if (! isSupported()) { if (!isSupported()) {
throw new ParticleVersionException("This particle effect is not supported by your server version"); throw new ParticleVersionException("This particle effect is not supported by your server version");
} }
if (! hasProperty(ParticleProperty.COLORABLE)) { if (!hasProperty(ParticleProperty.COLORABLE)) {
throw new ParticleColorException("This particle effect is not colorable"); throw new ParticleColorException("This particle effect is not colorable");
} }
if (! isColorCorrect(this, color)) { if (!isColorCorrect(this, color)) {
throw new ParticleColorException("The particle color type is incorrect"); throw new ParticleColorException("The particle color type is incorrect");
} }
new ParticlePacket(this, color, isLongDistance(center, players)).sendTo(center, players); new ParticlePacket(this, color, isLongDistance(center, players)).sendTo(center, players);
@ -775,13 +775,13 @@ public enum ParticleEffect {
* @see ParticlePacket#sendTo(Location, double) * @see ParticlePacket#sendTo(Location, double)
*/ */
public void display(ParticleData data, float offsetX, float offsetY, float offsetZ, float speed, int amount, Location center, double range) throws ParticleVersionException, ParticleDataException { public void display(ParticleData data, float offsetX, float offsetY, float offsetZ, float speed, int amount, Location center, double range) throws ParticleVersionException, ParticleDataException {
if (! isSupported()) { if (!isSupported()) {
throw new ParticleVersionException("This particle effect is not supported by your server version"); throw new ParticleVersionException("This particle effect is not supported by your server version");
} }
if (! hasProperty(ParticleProperty.REQUIRES_DATA)) { if (!hasProperty(ParticleProperty.REQUIRES_DATA)) {
throw new ParticleDataException("This particle effect does not require additional data"); throw new ParticleDataException("This particle effect does not require additional data");
} }
if (! isDataCorrect(this, data)) { if (!isDataCorrect(this, data)) {
throw new ParticleDataException("The particle data type is incorrect"); throw new ParticleDataException("The particle data type is incorrect");
} }
new ParticlePacket(this, offsetX, offsetY, offsetZ, speed, amount, range > 256, data).sendTo(center, range); new ParticlePacket(this, offsetX, offsetY, offsetZ, speed, amount, range > 256, data).sendTo(center, range);
@ -804,13 +804,13 @@ public enum ParticleEffect {
* @see ParticlePacket#sendTo(Location, List) * @see ParticlePacket#sendTo(Location, List)
*/ */
public void display(ParticleData data, float offsetX, float offsetY, float offsetZ, float speed, int amount, Location center, List<Player> players) throws ParticleVersionException, ParticleDataException { public void display(ParticleData data, float offsetX, float offsetY, float offsetZ, float speed, int amount, Location center, List<Player> players) throws ParticleVersionException, ParticleDataException {
if (! isSupported()) { if (!isSupported()) {
throw new ParticleVersionException("This particle effect is not supported by your server version"); throw new ParticleVersionException("This particle effect is not supported by your server version");
} }
if (! hasProperty(ParticleProperty.REQUIRES_DATA)) { if (!hasProperty(ParticleProperty.REQUIRES_DATA)) {
throw new ParticleDataException("This particle effect does not require additional data"); throw new ParticleDataException("This particle effect does not require additional data");
} }
if (! isDataCorrect(this, data)) { if (!isDataCorrect(this, data)) {
throw new ParticleDataException("The particle data type is incorrect"); throw new ParticleDataException("The particle data type is incorrect");
} }
new ParticlePacket(this, offsetX, offsetY, offsetZ, speed, amount, isLongDistance(center, players), data).sendTo(center, players); new ParticlePacket(this, offsetX, offsetY, offsetZ, speed, amount, isLongDistance(center, players), data).sendTo(center, players);
@ -849,13 +849,13 @@ public enum ParticleEffect {
* @see ParticlePacket#sendTo(Location, double) * @see ParticlePacket#sendTo(Location, double)
*/ */
public void display(ParticleData data, Vector direction, float speed, Location center, double range) throws ParticleVersionException, ParticleDataException { public void display(ParticleData data, Vector direction, float speed, Location center, double range) throws ParticleVersionException, ParticleDataException {
if (! isSupported()) { if (!isSupported()) {
throw new ParticleVersionException("This particle effect is not supported by your server version"); throw new ParticleVersionException("This particle effect is not supported by your server version");
} }
if (! hasProperty(ParticleProperty.REQUIRES_DATA)) { if (!hasProperty(ParticleProperty.REQUIRES_DATA)) {
throw new ParticleDataException("This particle effect does not require additional data"); throw new ParticleDataException("This particle effect does not require additional data");
} }
if (! isDataCorrect(this, data)) { if (!isDataCorrect(this, data)) {
throw new ParticleDataException("The particle data type is incorrect"); throw new ParticleDataException("The particle data type is incorrect");
} }
new ParticlePacket(this, direction, speed, range > 256, data).sendTo(center, range); new ParticlePacket(this, direction, speed, range > 256, data).sendTo(center, range);
@ -875,13 +875,13 @@ public enum ParticleEffect {
* @see ParticlePacket#sendTo(Location, List) * @see ParticlePacket#sendTo(Location, List)
*/ */
public void display(ParticleData data, Vector direction, float speed, Location center, List<Player> players) throws ParticleVersionException, ParticleDataException { public void display(ParticleData data, Vector direction, float speed, Location center, List<Player> players) throws ParticleVersionException, ParticleDataException {
if (! isSupported()) { if (!isSupported()) {
throw new ParticleVersionException("This particle effect is not supported by your server version"); throw new ParticleVersionException("This particle effect is not supported by your server version");
} }
if (! hasProperty(ParticleProperty.REQUIRES_DATA)) { if (!hasProperty(ParticleProperty.REQUIRES_DATA)) {
throw new ParticleDataException("This particle effect does not require additional data"); throw new ParticleDataException("This particle effect does not require additional data");
} }
if (! isDataCorrect(this, data)) { if (!isDataCorrect(this, data)) {
throw new ParticleDataException("The particle data type is incorrect"); throw new ParticleDataException("The particle data type is incorrect");
} }
new ParticlePacket(this, direction, speed, isLongDistance(center, players), data).sendTo(center, players); new ParticlePacket(this, direction, speed, isLongDistance(center, players), data).sendTo(center, players);
@ -1033,7 +1033,7 @@ public enum ParticleEffect {
*/ */
public BlockData(Material material, byte data) throws IllegalArgumentException { public BlockData(Material material, byte data) throws IllegalArgumentException {
super(material, data); super(material, data);
if (! material.isBlock()) { if (!material.isBlock()) {
throw new IllegalArgumentException("The material is not a block"); throw new IllegalArgumentException("The material is not a block");
} }
} }
@ -1425,7 +1425,7 @@ public enum ParticleEffect {
* @return The version number * @return The version number
*/ */
public static int getVersion() { public static int getVersion() {
if (! initialized) { if (!initialized) {
initialize(); initialize();
} }
return version; return version;
@ -1530,7 +1530,7 @@ public enum ParticleEffect {
String worldName = center.getWorld().getName(); String worldName = center.getWorld().getName();
double squared = range * range; double squared = range * range;
for (Player player : Bukkit.getOnlinePlayers()) { for (Player player : Bukkit.getOnlinePlayers()) {
if (! player.getWorld().getName().equals(worldName) || player.getLocation().distanceSquared(center) > squared) { if (!player.getWorld().getName().equals(worldName) || player.getLocation().distanceSquared(center) > squared) {
continue; continue;
} }
sendTo(center, player); sendTo(center, player);

View File

@ -44,7 +44,7 @@ public final class ReflectionUtils {
public static Constructor<?> getConstructor(Class<?> clazz, Class<?>... parameterTypes) throws NoSuchMethodException { public static Constructor<?> getConstructor(Class<?> clazz, Class<?>... parameterTypes) throws NoSuchMethodException {
Class<?>[] primitiveTypes = DataType.getPrimitive(parameterTypes); Class<?>[] primitiveTypes = DataType.getPrimitive(parameterTypes);
for (Constructor<?> constructor : clazz.getConstructors()) { for (Constructor<?> constructor : clazz.getConstructors()) {
if (! DataType.compare(DataType.getPrimitive(constructor.getParameterTypes()), primitiveTypes)) { if (!DataType.compare(DataType.getPrimitive(constructor.getParameterTypes()), primitiveTypes)) {
continue; continue;
} }
return constructor; return constructor;
@ -118,7 +118,7 @@ public final class ReflectionUtils {
public static Method getMethod(Class<?> clazz, String methodName, Class<?>... parameterTypes) throws NoSuchMethodException { public static Method getMethod(Class<?> clazz, String methodName, Class<?>... parameterTypes) throws NoSuchMethodException {
Class<?>[] primitiveTypes = DataType.getPrimitive(parameterTypes); Class<?>[] primitiveTypes = DataType.getPrimitive(parameterTypes);
for (Method method : clazz.getMethods()) { for (Method method : clazz.getMethods()) {
if (! method.getName().equals(methodName) || ! DataType.compare(DataType.getPrimitive(method.getParameterTypes()), primitiveTypes)) { if (!method.getName().equals(methodName) || !DataType.compare(DataType.getPrimitive(method.getParameterTypes()), primitiveTypes)) {
continue; continue;
} }
return method; return method;

View File

@ -65,7 +65,7 @@ public class RelationUtil {
return Relation.NEUTRAL; // ERROR return Relation.NEUTRAL; // ERROR
} }
if (! fthat.isNormal() || ! fme.isNormal()) { if (!fthat.isNormal() || !fme.isNormal()) {
return Relation.NEUTRAL; return Relation.NEUTRAL;
} }
@ -73,7 +73,7 @@ public class RelationUtil {
return Relation.MEMBER; return Relation.MEMBER;
} }
if (! ignorePeaceful && (fme.isPeaceful() || fthat.isPeaceful())) { if (!ignorePeaceful && (fme.isPeaceful() || fthat.isPeaceful())) {
return Relation.NEUTRAL; return Relation.NEUTRAL;
} }

View File

@ -110,7 +110,7 @@ public abstract class SpiralTask implements Runnable {
} }
public final void run() { public final void run() {
if (! this.valid() || ! readyToGo) { if (!this.valid() || !readyToGo) {
return; return;
} }
@ -118,7 +118,7 @@ public abstract class SpiralTask implements Runnable {
readyToGo = false; readyToGo = false;
// make sure we're still inside the specified radius // make sure we're still inside the specified radius
if (! this.insideRadius()) { if (!this.insideRadius()) {
return; return;
} }
@ -128,13 +128,13 @@ public abstract class SpiralTask implements Runnable {
// keep going until the task has been running for 20ms or more, then stop to take a breather // keep going until the task has been running for 20ms or more, then stop to take a breather
while (now() < loopStartTime + 20) { while (now() < loopStartTime + 20) {
// run the primary task on the current X/Z coordinates // run the primary task on the current X/Z coordinates
if (! this.work()) { if (!this.work()) {
this.finish(); this.finish();
return; return;
} }
// move on to next chunk in spiral // move on to next chunk in spiral
if (! this.moveToNext()) { if (!this.moveToNext()) {
return; return;
} }
} }
@ -145,7 +145,7 @@ public abstract class SpiralTask implements Runnable {
// step through chunks in spiral pattern from center; returns false if we're done, otherwise returns true // step through chunks in spiral pattern from center; returns false if we're done, otherwise returns true
public final boolean moveToNext() { public final boolean moveToNext() {
if (! this.valid()) { if (!this.valid()) {
return false; return false;
} }
@ -154,7 +154,7 @@ public abstract class SpiralTask implements Runnable {
current++; current++;
// if we're outside the radius, we're done // if we're outside the radius, we're done
if (! this.insideRadius()) { if (!this.insideRadius()) {
return false; return false;
} }
} else { // one leg/side of the spiral down... } else { // one leg/side of the spiral down...
@ -179,7 +179,7 @@ public abstract class SpiralTask implements Runnable {
public final boolean insideRadius() { public final boolean insideRadius() {
boolean inside = current < limit; boolean inside = current < limit;
if (! inside) { if (!inside) {
this.finish(); this.finish();
} }
return inside; return inside;
@ -193,7 +193,7 @@ public abstract class SpiralTask implements Runnable {
// we're done, whether finished or cancelled // we're done, whether finished or cancelled
public final void stop() { public final void stop() {
if (! this.valid()) { if (!this.valid()) {
return; return;
} }

View File

@ -95,7 +95,7 @@ public class WarpGUI implements InventoryHolder, FactionGUI {
// All clear lets TP them or ask for password // All clear lets TP them or ask for password
String warp = warpSlots.get(slot); String warp = warpSlots.get(slot);
if (! fme.getFaction().hasWarpPassword(warp)) { if (!fme.getFaction().hasWarpPassword(warp)) {
if (transact(fme)) { if (transact(fme)) {
doWarmup(warp); doWarmup(warp);
} }
@ -129,13 +129,13 @@ public class WarpGUI implements InventoryHolder, FactionGUI {
} }
private boolean transact(FPlayer player) { private boolean transact(FPlayer player) {
if (! SavageFactions.plugin.getConfig().getBoolean("warp-cost.enabled", false) || player.isAdminBypassing()) { if (!SavageFactions.plugin.getConfig().getBoolean("warp-cost.enabled", false) || player.isAdminBypassing()) {
return true; return true;
} }
double cost = SavageFactions.plugin.getConfig().getDouble("warp-cost.warp", 5); double cost = SavageFactions.plugin.getConfig().getDouble("warp-cost.warp", 5);
if (! Econ.shouldBeUsed() || this.fme == null || cost == 0.0 || fme.isAdminBypassing()) { if (!Econ.shouldBeUsed() || this.fme == null || cost == 0.0 || fme.isAdminBypassing()) {
return true; return true;
} }
@ -183,7 +183,7 @@ public class WarpGUI implements InventoryHolder, FactionGUI {
string = ChatColor.translateAlternateColorCodes('&', string); string = ChatColor.translateAlternateColorCodes('&', string);
string = string.replace("{warp}", warp); string = string.replace("{warp}", warp);
string = string.replace("{warp-protected}", faction.hasWarpPassword(warp) ? "Enabled" : "Disabled"); string = string.replace("{warp-protected}", faction.hasWarpPassword(warp) ? "Enabled" : "Disabled");
string = string.replace("{warp-cost}", ! SavageFactions.plugin.getConfig().getBoolean("warp-cost.enabled", false) ? "Disabled" : Integer.toString(SavageFactions.plugin.getConfig().getInt("warp-cost.warp", 5))); string = string.replace("{warp-cost}", !SavageFactions.plugin.getConfig().getBoolean("warp-cost.enabled", false) ? "Disabled" : Integer.toString(SavageFactions.plugin.getConfig().getInt("warp-cost.warp", 5)));
return string; return string;
} }
@ -243,7 +243,7 @@ public class WarpGUI implements InventoryHolder, FactionGUI {
ItemMeta itemMeta = itemStack.getItemMeta(); ItemMeta itemMeta = itemStack.getItemMeta();
if (! SavageFactions.plugin.mc17) { if (!SavageFactions.plugin.mc17) {
itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS, ItemFlag.HIDE_ATTRIBUTES); itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS, ItemFlag.HIDE_ATTRIBUTES);
} }

View File

@ -113,11 +113,11 @@ public abstract class MCommand<T extends MPlugin> {
} }
} }
if (! validCall(this.sender, this.args)) { if (!validCall(this.sender, this.args)) {
return; return;
} }
if (! this.isEnabled()) { if (!this.isEnabled()) {
return; return;
} }
@ -153,7 +153,7 @@ public abstract class MCommand<T extends MPlugin> {
} }
public boolean validSenderType(CommandSender sender, boolean informSenderIfNot) { public boolean validSenderType(CommandSender sender, boolean informSenderIfNot) {
if (this.senderMustBePlayer && ! (sender instanceof Player)) { if (this.senderMustBePlayer && !(sender instanceof Player)) {
if (informSenderIfNot) { if (informSenderIfNot) {
msg(TL.GENERIC_PLAYERONLY); msg(TL.GENERIC_PLAYERONLY);
} }

View File

@ -84,7 +84,7 @@ public abstract class MPlugin extends JavaPlugin {
// reference command will be used to prevent "unknown command" console messages // reference command will be used to prevent "unknown command" console messages
try { try {
Map<String, Map<String, Object>> refCmd = this.getDescription().getCommands(); Map<String, Map<String, Object>> refCmd = this.getDescription().getCommands();
if (refCmd != null && ! refCmd.isEmpty()) { if (refCmd != null && !refCmd.isEmpty()) {
this.refCommand = (String) (refCmd.keySet().toArray()[0]); this.refCommand = (String) (refCmd.keySet().toArray()[0]);
} }
} catch (ClassCastException ex) { } catch (ClassCastException ex) {
@ -114,7 +114,7 @@ public abstract class MPlugin extends JavaPlugin {
File lang = new File(getDataFolder(), "lang.yml"); File lang = new File(getDataFolder(), "lang.yml");
OutputStream out = null; OutputStream out = null;
InputStream defLangStream = this.getResource("lang.yml"); InputStream defLangStream = this.getResource("lang.yml");
if (! lang.exists()) { if (!lang.exists()) {
try { try {
getDataFolder().mkdir(); getDataFolder().mkdir();
lang.createNewFile(); lang.createNewFile();
@ -259,7 +259,7 @@ public abstract class MPlugin extends JavaPlugin {
} }
for (final MCommand<?> command : this.getBaseCommands()) { for (final MCommand<?> command : this.getBaseCommands()) {
if (noSlash && ! command.allowNoSlashAccess) { if (noSlash && !command.allowNoSlashAccess) {
continue; continue;
} }

View File

@ -120,7 +120,7 @@ public enum PermissableAction {
// If under the 1.13 version we will use the colorable option. // If under the 1.13 version we will use the colorable option.
if (! SavageFactions.plugin.mc113) { if (!SavageFactions.plugin.mc113) {
DyeColor dyeColor = null; DyeColor dyeColor = null;
try { try {
@ -140,7 +140,7 @@ public enum PermissableAction {
lore.add(replacePlaceholders(loreLine, fme, permissable)); lore.add(replacePlaceholders(loreLine, fme, permissable));
} }
if (! SavageFactions.plugin.mc17) { if (!SavageFactions.plugin.mc17) {
itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS, ItemFlag.HIDE_ATTRIBUTES); itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS, ItemFlag.HIDE_ATTRIBUTES);
} }

View File

@ -92,7 +92,7 @@ public class PermissableActionGUI implements InventoryHolder, FactionGUI {
if (disabled) { if (disabled) {
break; break;
} }
if (! usedDummySlots.isEmpty()) { if (!usedDummySlots.isEmpty()) {
int slot = usedDummySlots.get(0); int slot = usedDummySlots.get(0);
actionSlots.put(slot, action); actionSlots.put(slot, action);
} else { } else {
@ -126,7 +126,7 @@ public class PermissableActionGUI implements InventoryHolder, FactionGUI {
} }
return; return;
} }
if (! actionSlots.containsKey(slot)) { if (!actionSlots.containsKey(slot)) {
return; return;
} }
@ -194,7 +194,7 @@ public class PermissableActionGUI implements InventoryHolder, FactionGUI {
} }
backButtonMeta.setLore(lore); backButtonMeta.setLore(lore);
if (! SavageFactions.plugin.mc17) { if (!SavageFactions.plugin.mc17) {
backButtonMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS, ItemFlag.HIDE_ATTRIBUTES); backButtonMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS, ItemFlag.HIDE_ATTRIBUTES);
} }
@ -228,7 +228,7 @@ public class PermissableActionGUI implements InventoryHolder, FactionGUI {
} }
ItemMeta meta = dummyItem.getItemMeta(); ItemMeta meta = dummyItem.getItemMeta();
if (! SavageFactions.plugin.mc17) { if (!SavageFactions.plugin.mc17) {
meta.addItemFlags(ItemFlag.HIDE_ENCHANTS, ItemFlag.HIDE_ATTRIBUTES); meta.addItemFlags(ItemFlag.HIDE_ENCHANTS, ItemFlag.HIDE_ATTRIBUTES);
} }
@ -283,7 +283,7 @@ public class PermissableActionGUI implements InventoryHolder, FactionGUI {
} }
itemMeta.setLore(lore); itemMeta.setLore(lore);
if (! SavageFactions.plugin.mc17) { if (!SavageFactions.plugin.mc17) {
itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS, ItemFlag.HIDE_ATTRIBUTES); itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS, ItemFlag.HIDE_ATTRIBUTES);
} }

View File

@ -85,7 +85,7 @@ public class PermissableRelationGUI implements InventoryHolder, FactionGUI {
@Override @Override
public void onClick(int slot, ClickType clickType) { public void onClick(int slot, ClickType clickType) {
if (! relationSlots.containsKey(slot)) { if (!relationSlots.containsKey(slot)) {
return; return;
} }
@ -142,7 +142,7 @@ public class PermissableRelationGUI implements InventoryHolder, FactionGUI {
} }
ItemMeta meta = dummyItem.getItemMeta(); ItemMeta meta = dummyItem.getItemMeta();
if (! SavageFactions.plugin.mc17) { if (!SavageFactions.plugin.mc17) {
meta.addItemFlags(ItemFlag.HIDE_ENCHANTS, ItemFlag.HIDE_ATTRIBUTES); meta.addItemFlags(ItemFlag.HIDE_ENCHANTS, ItemFlag.HIDE_ATTRIBUTES);
} }
@ -196,7 +196,7 @@ public class PermissableRelationGUI implements InventoryHolder, FactionGUI {
} }
itemMeta.setLore(lore); itemMeta.setLore(lore);
if (! SavageFactions.plugin.mc17) { if (!SavageFactions.plugin.mc17) {
itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS, ItemFlag.HIDE_ATTRIBUTES); itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS, ItemFlag.HIDE_ATTRIBUTES);
} }

View File

@ -114,7 +114,7 @@ public class FUpgradesGUI implements Listener {
} }
if (spawnerLevel == 2) { if (spawnerLevel == 2) {
int cost = SavageFactions.plugin.getConfig().getInt("fupgrades.MainMenu.Spawners.Cost.level-3"); int cost = SavageFactions.plugin.getConfig().getInt("fupgrades.MainMenu.Spawners.Cost.level-3");
if (! hasMoney(fme, cost)) { if (!hasMoney(fme, cost)) {
return; return;
} }
takeMoney(fme, cost); takeMoney(fme, cost);
@ -123,7 +123,7 @@ public class FUpgradesGUI implements Listener {
} }
if (spawnerLevel == 1) { if (spawnerLevel == 1) {
int cost = SavageFactions.plugin.getConfig().getInt("fupgrades.MainMenu.Spawners.Cost.level-2"); int cost = SavageFactions.plugin.getConfig().getInt("fupgrades.MainMenu.Spawners.Cost.level-2");
if (! hasMoney(fme, cost)) { if (!hasMoney(fme, cost)) {
return; return;
} }
takeMoney(fme, cost); takeMoney(fme, cost);
@ -132,7 +132,7 @@ public class FUpgradesGUI implements Listener {
} }
if (spawnerLevel == 0) { if (spawnerLevel == 0) {
int cost = SavageFactions.plugin.getConfig().getInt("fupgrades.MainMenu.Spawners.Cost.level-1"); int cost = SavageFactions.plugin.getConfig().getInt("fupgrades.MainMenu.Spawners.Cost.level-1");
if (! hasMoney(fme, cost)) { if (!hasMoney(fme, cost)) {
return; return;
} }
takeMoney(fme, cost); takeMoney(fme, cost);
@ -147,7 +147,7 @@ public class FUpgradesGUI implements Listener {
} }
if (expLevel == 2) { if (expLevel == 2) {
int cost = SavageFactions.plugin.getConfig().getInt("fupgrades.MainMenu.EXP.Cost.level-3"); int cost = SavageFactions.plugin.getConfig().getInt("fupgrades.MainMenu.EXP.Cost.level-3");
if (! hasMoney(fme, cost)) { if (!hasMoney(fme, cost)) {
return; return;
} }
takeMoney(fme, cost); takeMoney(fme, cost);
@ -156,7 +156,7 @@ public class FUpgradesGUI implements Listener {
} }
if (expLevel == 1) { if (expLevel == 1) {
int cost = SavageFactions.plugin.getConfig().getInt("fupgrades.MainMenu.EXP.Cost.level-2"); int cost = SavageFactions.plugin.getConfig().getInt("fupgrades.MainMenu.EXP.Cost.level-2");
if (! hasMoney(fme, cost)) { if (!hasMoney(fme, cost)) {
return; return;
} }
takeMoney(fme, cost); takeMoney(fme, cost);
@ -165,7 +165,7 @@ public class FUpgradesGUI implements Listener {
} }
if (expLevel == 0) { if (expLevel == 0) {
int cost = SavageFactions.plugin.getConfig().getInt("fupgrades.MainMenu.EXP.Cost.level-1"); int cost = SavageFactions.plugin.getConfig().getInt("fupgrades.MainMenu.EXP.Cost.level-1");
if (! hasMoney(fme, cost)) { if (!hasMoney(fme, cost)) {
return; return;
} }
takeMoney(fme, cost); takeMoney(fme, cost);
@ -180,7 +180,7 @@ public class FUpgradesGUI implements Listener {
} }
if (chestLevel == 2) { if (chestLevel == 2) {
int cost = SavageFactions.plugin.getConfig().getInt("fupgrades.MainMenu.Chest.Cost.level-3"); int cost = SavageFactions.plugin.getConfig().getInt("fupgrades.MainMenu.Chest.Cost.level-3");
if (! hasMoney(fme, cost)) { if (!hasMoney(fme, cost)) {
return; return;
} }
takeMoney(fme, cost); takeMoney(fme, cost);
@ -190,7 +190,7 @@ public class FUpgradesGUI implements Listener {
} }
if (chestLevel == 1) { if (chestLevel == 1) {
int cost = SavageFactions.plugin.getConfig().getInt("fupgrades.MainMenu.Chest.Cost.level-2"); int cost = SavageFactions.plugin.getConfig().getInt("fupgrades.MainMenu.Chest.Cost.level-2");
if (! hasMoney(fme, cost)) { if (!hasMoney(fme, cost)) {
return; return;
} }
takeMoney(fme, cost); takeMoney(fme, cost);
@ -200,7 +200,7 @@ public class FUpgradesGUI implements Listener {
} }
if (chestLevel == 0) { if (chestLevel == 0) {
int cost = SavageFactions.plugin.getConfig().getInt("fupgrades.MainMenu.Chest.Cost.level-1"); int cost = SavageFactions.plugin.getConfig().getInt("fupgrades.MainMenu.Chest.Cost.level-1");
if (! hasMoney(fme, cost)) { if (!hasMoney(fme, cost)) {
return; return;
} }
takeMoney(fme, cost); takeMoney(fme, cost);
@ -254,7 +254,7 @@ public class FUpgradesGUI implements Listener {
ItemStack expItem = SavageFactions.plugin.createItem(expMaterial, expAmt, expData, expName, expLore); ItemStack expItem = SavageFactions.plugin.createItem(expMaterial, expAmt, expData, expName, expLore);
if (expLevel >= 1) { if (expLevel >= 1) {
ItemMeta itemMeta = expItem.getItemMeta(); ItemMeta itemMeta = expItem.getItemMeta();
if (! SavageFactions.plugin.mc17) { if (!SavageFactions.plugin.mc17) {
itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS); itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS);
} }
itemMeta.addEnchant(Enchantment.DURABILITY, 3, true); itemMeta.addEnchant(Enchantment.DURABILITY, 3, true);
@ -294,7 +294,7 @@ public class FUpgradesGUI implements Listener {
cropItem.getItemMeta().setLore(cropLore); cropItem.getItemMeta().setLore(cropLore);
if (cropLevel >= 1) { if (cropLevel >= 1) {
ItemMeta itemMeta = cropItem.getItemMeta(); ItemMeta itemMeta = cropItem.getItemMeta();
if (! SavageFactions.plugin.mc17) { if (!SavageFactions.plugin.mc17) {
itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS); itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS);
} }
itemMeta.addEnchant(Enchantment.DURABILITY, 3, true); itemMeta.addEnchant(Enchantment.DURABILITY, 3, true);
@ -309,7 +309,7 @@ public class FUpgradesGUI implements Listener {
spawnerItem.getItemMeta().setLore(spawnerLore); spawnerItem.getItemMeta().setLore(spawnerLore);
if (spawnerLevel >= 1) { if (spawnerLevel >= 1) {
ItemMeta itemMeta = spawnerItem.getItemMeta(); ItemMeta itemMeta = spawnerItem.getItemMeta();
if (! SavageFactions.plugin.mc17) { if (!SavageFactions.plugin.mc17) {
itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS); itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS);
} }
itemMeta.addEnchant(Enchantment.DURABILITY, 3, true); itemMeta.addEnchant(Enchantment.DURABILITY, 3, true);
@ -337,7 +337,7 @@ public class FUpgradesGUI implements Listener {
if (chestlevel >= 1) { if (chestlevel >= 1) {
ItemMeta itemMeta = chestItem.getItemMeta(); ItemMeta itemMeta = chestItem.getItemMeta();
if (! SavageFactions.plugin.mc17) { if (!SavageFactions.plugin.mc17) {
itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS); itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS);
} }
itemMeta.addEnchant(Enchantment.DURABILITY, 3, true); itemMeta.addEnchant(Enchantment.DURABILITY, 3, true);

View File

@ -23,7 +23,7 @@ public class NBTFile extends NBTCompound {
} }
public void save() throws IOException { public void save() throws IOException {
if (! file.exists()) { if (!file.exists()) {
file.getParentFile().mkdirs(); file.getParentFile().mkdirs();
file.createNewFile(); file.createNewFile();
} }

Some files were not shown because too many files have changed in this diff Show More