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

Default FPerms Fixed

Browse Source
This commit is contained in:
Driftay 2019-08-01 06:53:46 -04:00
parent 31c50473f0
commit 477041e223
3 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/massivecraft/factions/Conf.java
View File

@ -342,7 +342,7 @@ public class Conf {
// Default Options - Is this even shown on the Conf.json? // Default Options - Is this even shown on the Conf.json?
public static transient HashMap<String, DefaultPermissions> defaultFactionPermissions = new HashMap<>(); public static HashMap<String, DefaultPermissions> defaultFactionPermissions = new HashMap<>();
//Cooldown for /f logout in seconds //Cooldown for /f logout in seconds
public static long logoutCooldown = 30; public static long logoutCooldown = 30;

7
src/main/java/com/massivecraft/factions/Faction.java
View File

@ -13,7 +13,6 @@ import com.massivecraft.factions.zcore.fperms.PermissableAction;
import com.massivecraft.factions.zcore.fupgrades.UpgradeType; import com.massivecraft.factions.zcore.fupgrades.UpgradeType;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
@ -29,10 +28,6 @@ public interface Faction extends EconomyParticipator {
void deinviteAllAlts(); void deinviteAllAlts();
Map<String, Long> getBoosters();
void altInvite(FPlayer fplayer); void altInvite(FPlayer fplayer);
boolean addAltPlayer(FPlayer fplayer); boolean addAltPlayer(FPlayer fplayer);
@ -109,8 +104,6 @@ public interface Faction extends EconomyParticipator {
HashMap<Integer, String> getRulesMap(); HashMap<Integer, String> getRulesMap();
void setRule(int index, String rule);
void addRule(String rule); void addRule(String rule);
void removeRule(int index); void removeRule(int index);

9
src/main/java/com/massivecraft/factions/zcore/persist/MemoryFaction.java
View File

@ -72,7 +72,7 @@ public abstract class MemoryFaction implements Faction, EconomyParticipator {
private long lastDeath; private long lastDeath;
private int strikes = 0; private int strikes = 0;
private int points = 0; private int points = 0;
private Map<String, Long> boosters;
// -------------------------------------------- // // -------------------------------------------- //
// Construct // Construct
@ -94,7 +94,6 @@ public abstract class MemoryFaction implements Faction, EconomyParticipator {
this.foundedDate = System.currentTimeMillis(); this.foundedDate = System.currentTimeMillis();
this.maxVaults = Conf.defaultMaxVaults; this.maxVaults = Conf.defaultMaxVaults;
this.defaultRole = Role.RECRUIT; this.defaultRole = Role.RECRUIT;
boosters = new ConcurrentHashMap<>();
resetPerms(); // Reset on new Faction so it has default values. resetPerms(); // Reset on new Faction so it has default values.
} }
@ -115,7 +114,6 @@ public abstract class MemoryFaction implements Faction, EconomyParticipator {
relationWish = old.relationWish; relationWish = old.relationWish;
claimOwnership = old.claimOwnership; claimOwnership = old.claimOwnership;
fplayers = new HashSet<>(); fplayers = new HashSet<>();
boosters = new ConcurrentHashMap<>();
alts = new HashSet<>(); alts = new HashSet<>();
invites = old.invites; invites = old.invites;
announcements = old.announcements; announcements = old.announcements;
@ -430,11 +428,6 @@ public abstract class MemoryFaction implements Faction, EconomyParticipator {
chest.setContents(contents); chest.setContents(contents);
} }
@Override
public Map<String, Long> getBoosters() {
return this.boosters;
}
@Override @Override
public void setBannerPattern(ItemStack banner) { public void setBannerPattern(ItemStack banner) {