Some minor fixes to the previous commit.
This commit is contained in:
parent
ca6b185bd1
commit
2c5438bf70
@ -187,11 +187,6 @@ public class Conf
|
||||
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;
|
||||
|
@ -9,6 +9,7 @@ import org.bukkit.entity.Player;
|
||||
import com.massivecraft.factions.iface.EconomyParticipator;
|
||||
import com.massivecraft.factions.iface.RelationParticipator;
|
||||
import com.massivecraft.factions.integration.Econ;
|
||||
import com.massivecraft.factions.integration.SpoutFeatures;
|
||||
import com.massivecraft.factions.struct.FFlag;
|
||||
import com.massivecraft.factions.struct.FPerm;
|
||||
import com.massivecraft.factions.struct.Rel;
|
||||
@ -99,7 +100,7 @@ public class Faction extends Entity implements EconomyParticipator
|
||||
// FIELD: cape
|
||||
private String cape;
|
||||
public String getCape() { return cape; }
|
||||
public void setCape(String val) { this.cape = val; }
|
||||
public void setCape(String val) { this.cape = val; SpoutFeatures.updateCape(this, null); }
|
||||
|
||||
// FIELD: powerBoost
|
||||
// special increase/decrease to default and max power for this faction
|
||||
|
@ -53,7 +53,6 @@ public class FactionsPlayerListener implements Listener
|
||||
// Update the lastLoginTime for this fplayer
|
||||
me.setLastLoginTime(System.currentTimeMillis());
|
||||
|
||||
//SpoutFeatures.updateAppearancesShortly(event.getPlayer());
|
||||
SpoutFeatures.updateTitleShortly(event.getPlayer(), null);
|
||||
SpoutFeatures.updateTitleShortly(null, event.getPlayer());
|
||||
SpoutFeatures.updateCapeShortly(event.getPlayer(), null);
|
||||
|
@ -84,6 +84,7 @@ public enum FPerm
|
||||
if (str.startsWith("s")) return SETHOME;
|
||||
if (str.startsWith("w")) return WITHDRAW;
|
||||
if (str.startsWith("t")) return TERRITORY;
|
||||
if (str.startsWith("ca")) return CAPE;
|
||||
if (str.startsWith("di")) return DISBAND;
|
||||
if (str.startsWith("pe")) return PERMS;
|
||||
return null;
|
||||
|
Loading…
Reference in New Issue
Block a user