Forgot Some Code

SaberLLC · Jul 28, 2019 · 8f72979 · 8f72979
1 parent b8d4f6b
commit 8f72979
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 19 deletions.
diff --git a/src/main/java/com/massivecraft/factions/Faction.java b/src/main/java/com/massivecraft/factions/Faction.java
@@ -3,7 +3,6 @@
 import com.massivecraft.factions.event.FactionDisbandEvent.PlayerDisbandReason;
 import com.massivecraft.factions.iface.EconomyParticipator;
 import com.massivecraft.factions.iface.RelationParticipator;
-import com.massivecraft.factions.shop.Pair;
 import com.massivecraft.factions.struct.BanInfo;
 import com.massivecraft.factions.struct.Relation;
 import com.massivecraft.factions.struct.Role;
@@ -30,11 +29,9 @@ public interface Faction extends EconomyParticipator {
 
 	void deinviteAllAlts();
 
-	Map<String, Pair<Integer, Long>> getActivePotions();
 
 	Map<String, Long> getBoosters();
 
-	Map<String, Pair<Integer, Long>> getPotionEffects();
 
 	void altInvite(FPlayer fplayer);
 

diff --git a/src/main/java/com/massivecraft/factions/cmd/FCmdRoot.java b/src/main/java/com/massivecraft/factions/cmd/FCmdRoot.java
@@ -124,7 +124,6 @@ public class FCmdRoot extends FCommand {
 	public CmdFGlobal cmdFGlobal = new CmdFGlobal();
 	public CmdViewChest cmdViewChest = new CmdViewChest();
 	public CmdPoints cmdPoints = new CmdPoints();
-	public CmdShop cmdShop = new CmdShop();
 
 
 
@@ -243,7 +242,6 @@ public FCmdRoot() {
 		this.addSubCommand(this.cmdCorner);
 		this.addSubCommand(this.cmdFGlobal);
 		this.addSubCommand(this.cmdViewChest);
-		this.addSubCommand(this.cmdShop);
 
 		if (SaberFactions.plugin.getConfig().getBoolean("f-inventory-see.Enabled")) {
 			this.addSubCommand(this.cmdInventorySee);

diff --git a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFaction.java b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFaction.java
@@ -8,7 +8,6 @@
 import com.massivecraft.factions.iface.RelationParticipator;
 import com.massivecraft.factions.integration.Econ;
 import com.massivecraft.factions.scoreboards.FTeamWrapper;
-import com.massivecraft.factions.shop.Pair;
 import com.massivecraft.factions.struct.BanInfo;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.struct.Relation;
@@ -73,7 +72,6 @@ public abstract class MemoryFaction implements Faction, EconomyParticipator {
     private long lastDeath;
     private int strikes = 0;
     private int points = 0;
-    private Map<String, Pair<Integer, Long>> potionEffects;
     private Map<String, Long> boosters;
 
     // -------------------------------------------- //
@@ -96,7 +94,6 @@ public MemoryFaction(String id) {
         this.foundedDate = System.currentTimeMillis();
         this.maxVaults = Conf.defaultMaxVaults;
         this.defaultRole = Role.RECRUIT;
-        potionEffects = new ConcurrentHashMap<>();
         boosters = new ConcurrentHashMap<>();
         resetPerms(); // Reset on new Faction so it has default values.
     }
@@ -118,7 +115,6 @@ public MemoryFaction(MemoryFaction old) {
         relationWish = old.relationWish;
         claimOwnership = old.claimOwnership;
         fplayers = new HashSet<>();
-        potionEffects = new ConcurrentHashMap<>();
         boosters = new ConcurrentHashMap<>();
         alts = new HashSet<>();
         invites = old.invites;
@@ -1251,16 +1247,6 @@ public Set<String> getOwnerList(FLocation loc) {
         return claimOwnership.get(loc);
     }
 
-    @Override
-    public Map<String, Pair<Integer, Long>> getActivePotions() {
-        return this.potionEffects;
-    }
-
-    @Override
-    public Map<String, Pair<Integer, Long>> getPotionEffects() {
-        return this.potionEffects;
-    }
-
     public String getOwnerListString(FLocation loc) {
         Set<String> ownerData = claimOwnership.get(loc);
         if (ownerData == null || ownerData.isEmpty()) {