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

Forgot Some Code

This commit is contained in:
Driftay 2019-07-27 23:43:20 -04:00
parent b8d4f6b611
commit 8f72979fdf
3 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,6 @@ package com.massivecraft.factions;
import com.massivecraft.factions.event.FactionDisbandEvent.PlayerDisbandReason; import com.massivecraft.factions.event.FactionDisbandEvent.PlayerDisbandReason;
import com.massivecraft.factions.iface.EconomyParticipator; import com.massivecraft.factions.iface.EconomyParticipator;
import com.massivecraft.factions.iface.RelationParticipator; import com.massivecraft.factions.iface.RelationParticipator;
import com.massivecraft.factions.shop.Pair;
import com.massivecraft.factions.struct.BanInfo; import com.massivecraft.factions.struct.BanInfo;
import com.massivecraft.factions.struct.Relation; import com.massivecraft.factions.struct.Relation;
import com.massivecraft.factions.struct.Role; import com.massivecraft.factions.struct.Role;
@ -30,11 +29,9 @@ public interface Faction extends EconomyParticipator {
void deinviteAllAlts(); void deinviteAllAlts();
Map<String, Pair<Integer, Long>> getActivePotions();
Map<String, Long> getBoosters(); Map<String, Long> getBoosters();
Map<String, Pair<Integer, Long>> getPotionEffects();
void altInvite(FPlayer fplayer); void altInvite(FPlayer fplayer);

2
src/main/java/com/massivecraft/factions/cmd/FCmdRoot.java
View File

@ -124,7 +124,6 @@ public class FCmdRoot extends FCommand {
public CmdFGlobal cmdFGlobal = new CmdFGlobal(); public CmdFGlobal cmdFGlobal = new CmdFGlobal();
public CmdViewChest cmdViewChest = new CmdViewChest(); public CmdViewChest cmdViewChest = new CmdViewChest();
public CmdPoints cmdPoints = new CmdPoints(); public CmdPoints cmdPoints = new CmdPoints();
public CmdShop cmdShop = new CmdShop();
@ -243,7 +242,6 @@ public class FCmdRoot extends FCommand {
this.addSubCommand(this.cmdCorner); this.addSubCommand(this.cmdCorner);
this.addSubCommand(this.cmdFGlobal); this.addSubCommand(this.cmdFGlobal);
this.addSubCommand(this.cmdViewChest); this.addSubCommand(this.cmdViewChest);
this.addSubCommand(this.cmdShop);
if (SaberFactions.plugin.getConfig().getBoolean("f-inventory-see.Enabled")) { if (SaberFactions.plugin.getConfig().getBoolean("f-inventory-see.Enabled")) {
this.addSubCommand(this.cmdInventorySee); this.addSubCommand(this.cmdInventorySee);

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

@ -8,7 +8,6 @@ import com.massivecraft.factions.iface.EconomyParticipator;
import com.massivecraft.factions.iface.RelationParticipator; import com.massivecraft.factions.iface.RelationParticipator;
import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.scoreboards.FTeamWrapper; import com.massivecraft.factions.scoreboards.FTeamWrapper;
import com.massivecraft.factions.shop.Pair;
import com.massivecraft.factions.struct.BanInfo; import com.massivecraft.factions.struct.BanInfo;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Relation; import com.massivecraft.factions.struct.Relation;
@ -73,7 +72,6 @@ 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, Pair<Integer, Long>> potionEffects;
private Map<String, Long> boosters; private Map<String, Long> boosters;
// -------------------------------------------- // // -------------------------------------------- //
@ -96,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;
potionEffects = new ConcurrentHashMap<>();
boosters = new ConcurrentHashMap<>(); boosters = new ConcurrentHashMap<>();
resetPerms(); // Reset on new Faction so it has default values. resetPerms(); // Reset on new Faction so it has default values.
} }
@ -118,7 +115,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<>();
potionEffects = new ConcurrentHashMap<>();
boosters = new ConcurrentHashMap<>(); boosters = new ConcurrentHashMap<>();
alts = new HashSet<>(); alts = new HashSet<>();
invites = old.invites; invites = old.invites;
@ -1251,16 +1247,6 @@ public abstract class MemoryFaction implements Faction, EconomyParticipator {
return claimOwnership.get(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) { public String getOwnerListString(FLocation loc) {
Set<String> ownerData = claimOwnership.get(loc); Set<String> ownerData = claimOwnership.get(loc);
if (ownerData == null || ownerData.isEmpty()) { if (ownerData == null || ownerData.isEmpty()) {