From 477041e223d65ad1470db15a74dd6ee54aa23a89 Mon Sep 17 00:00:00 2001 From: Driftay Date: Thu, 1 Aug 2019 06:53:46 -0400 Subject: [PATCH] Default FPerms Fixed --- src/main/java/com/massivecraft/factions/Conf.java | 2 +- src/main/java/com/massivecraft/factions/Faction.java | 7 ------- .../factions/zcore/persist/MemoryFaction.java | 9 +-------- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/Conf.java b/src/main/java/com/massivecraft/factions/Conf.java index ab5a40ac..b1ddf81e 100644 --- a/src/main/java/com/massivecraft/factions/Conf.java +++ b/src/main/java/com/massivecraft/factions/Conf.java @@ -342,7 +342,7 @@ public class Conf { // Default Options - Is this even shown on the Conf.json? - public static transient HashMap defaultFactionPermissions = new HashMap<>(); + public static HashMap defaultFactionPermissions = new HashMap<>(); //Cooldown for /f logout in seconds public static long logoutCooldown = 30; diff --git a/src/main/java/com/massivecraft/factions/Faction.java b/src/main/java/com/massivecraft/factions/Faction.java index c50007dd..ff7b674a 100644 --- a/src/main/java/com/massivecraft/factions/Faction.java +++ b/src/main/java/com/massivecraft/factions/Faction.java @@ -13,7 +13,6 @@ import com.massivecraft.factions.zcore.fperms.PermissableAction; import com.massivecraft.factions.zcore.fupgrades.UpgradeType; import org.bukkit.ChatColor; import org.bukkit.Location; -import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; @@ -29,10 +28,6 @@ public interface Faction extends EconomyParticipator { void deinviteAllAlts(); - - Map getBoosters(); - - void altInvite(FPlayer fplayer); boolean addAltPlayer(FPlayer fplayer); @@ -109,8 +104,6 @@ public interface Faction extends EconomyParticipator { HashMap getRulesMap(); - void setRule(int index, String rule); - void addRule(String rule); void removeRule(int index); diff --git a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFaction.java b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFaction.java index da215c26..4365c43e 100644 --- a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFaction.java +++ b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFaction.java @@ -72,7 +72,7 @@ public abstract class MemoryFaction implements Faction, EconomyParticipator { private long lastDeath; private int strikes = 0; private int points = 0; - private Map boosters; + // -------------------------------------------- // // Construct @@ -94,7 +94,6 @@ public abstract class MemoryFaction implements Faction, EconomyParticipator { this.foundedDate = System.currentTimeMillis(); this.maxVaults = Conf.defaultMaxVaults; this.defaultRole = Role.RECRUIT; - boosters = new ConcurrentHashMap<>(); resetPerms(); // Reset on new Faction so it has default values. } @@ -115,7 +114,6 @@ public abstract class MemoryFaction implements Faction, EconomyParticipator { relationWish = old.relationWish; claimOwnership = old.claimOwnership; fplayers = new HashSet<>(); - boosters = new ConcurrentHashMap<>(); alts = new HashSet<>(); invites = old.invites; announcements = old.announcements; @@ -430,11 +428,6 @@ public abstract class MemoryFaction implements Faction, EconomyParticipator { chest.setContents(contents); } - @Override - public Map getBoosters() { - return this.boosters; - } - @Override public void setBannerPattern(ItemStack banner) {