From 68d3145c7df795296003453ce02d261230eded41 Mon Sep 17 00:00:00 2001 From: gravitylow Date: Tue, 15 Apr 2014 13:23:18 -0400 Subject: [PATCH] Let's clean up this config.. --- .../java/com/massivecraft/factions/Conf.java | 26 ------------------- .../listeners/FactionsPlayerListener.java | 2 -- 2 files changed, 28 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/Conf.java b/src/main/java/com/massivecraft/factions/Conf.java index d6d7a4bd..3c321f4d 100644 --- a/src/main/java/com/massivecraft/factions/Conf.java +++ b/src/main/java/com/massivecraft/factions/Conf.java @@ -81,11 +81,6 @@ public class Conf { public static boolean worldGuardChecking = false; public static boolean worldGuardBuildPriority = false; - //LWC - public static boolean lwcIntegration = false; - public static boolean onUnclaimResetLwcLocks = false; - public static boolean onCaptureResetLwcLocks = false; - // server logging options public static boolean logFactionCreate = true; public static boolean logFactionDisband = true; @@ -221,27 +216,6 @@ public class Conf { public static Set territoryDenyUseageMaterialsWhenOffline = EnumSet.noneOf(Material.class); public static transient Set safeZoneNerfedCreatureTypes = EnumSet.noneOf(EntityType.class); - - // Spout features - public static boolean spoutFactionTagsOverNames = true; // show faction tags over names over player heads - public static boolean spoutFactionTitlesOverNames = true; // whether to include player's title in that - public static boolean spoutFactionAdminCapes = true; // Show capes on faction admins, colored based on the viewer's relation to the target player - public static boolean spoutFactionModeratorCapes = true; // same, but for faction moderators - public static int spoutTerritoryDisplayPosition = 1; // permanent territory display, instead of by chat; 0 = disabled, 1 = top left, 2 = top center, 3+ = top right - public static float spoutTerritoryDisplaySize = 1.0f; // text scale (size) for territory display - public static boolean spoutTerritoryDisplayShowDescription = true; // whether to show the faction description, not just the faction tag - public static boolean spoutTerritoryOwnersShow = true; // show territory owner list as well - public static boolean spoutTerritoryNoticeShow = true; // show additional brief territory notice near center of screen, to be sure player notices transition - public static int spoutTerritoryNoticeTop = 40; // how far down the screen to place the additional notice - public static boolean spoutTerritoryNoticeShowDescription = false; // whether to show the faction description in the notice, not just the faction tag - public static float spoutTerritoryNoticeSize = 1.5f; // text scale (size) for notice - public static float spoutTerritoryNoticeLeaveAfterSeconds = 2.00f; // how many seconds before the notice goes away - public static String capeAlly = "https://github.com/MassiveCraft/Factions/raw/master/capes/ally.png"; - public static String capeEnemy = "https://github.com/MassiveCraft/Factions/raw/master/capes/enemy.png"; - public static String capeMember = "https://github.com/MassiveCraft/Factions/raw/master/capes/member.png"; - public static String capeNeutral = "https://github.com/MassiveCraft/Factions/raw/master/capes/neutral.png"; - public static String capePeaceful = "https://github.com/MassiveCraft/Factions/raw/master/capes/peaceful.png"; - // Economy settings public static boolean econEnabled = false; public static String econUniverseAccount = ""; diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java index c685c579..c850381c 100644 --- a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java +++ b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java @@ -108,8 +108,6 @@ public class FactionsPlayerListener implements Listener { && Conf.ownedMessageOnBorder && - (!Conf.spoutTerritoryOwnersShow) - && myFaction == factionTo && !ownersTo.isEmpty()