From 2c5438bf70689c4268e4cc27150373a767ae1661 Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Wed, 9 May 2012 03:32:04 +0200 Subject: [PATCH] Some minor fixes to the previous commit. --- src/com/massivecraft/factions/Conf.java | 5 ----- src/com/massivecraft/factions/Faction.java | 3 ++- .../factions/listeners/FactionsPlayerListener.java | 1 - src/com/massivecraft/factions/struct/FPerm.java | 1 + 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/com/massivecraft/factions/Conf.java b/src/com/massivecraft/factions/Conf.java index 6514dc8d..af1fb8ce 100644 --- a/src/com/massivecraft/factions/Conf.java +++ b/src/com/massivecraft/factions/Conf.java @@ -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; diff --git a/src/com/massivecraft/factions/Faction.java b/src/com/massivecraft/factions/Faction.java index 1902f4c9..d31cd30c 100644 --- a/src/com/massivecraft/factions/Faction.java +++ b/src/com/massivecraft/factions/Faction.java @@ -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 diff --git a/src/com/massivecraft/factions/listeners/FactionsPlayerListener.java b/src/com/massivecraft/factions/listeners/FactionsPlayerListener.java index 9d27bd91..1c96ae01 100644 --- a/src/com/massivecraft/factions/listeners/FactionsPlayerListener.java +++ b/src/com/massivecraft/factions/listeners/FactionsPlayerListener.java @@ -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); diff --git a/src/com/massivecraft/factions/struct/FPerm.java b/src/com/massivecraft/factions/struct/FPerm.java index 095f2320..af3d993b 100644 --- a/src/com/massivecraft/factions/struct/FPerm.java +++ b/src/com/massivecraft/factions/struct/FPerm.java @@ -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;