From 15024bf880997977a9b9499ed2b3aa91d897168b Mon Sep 17 00:00:00 2001 From: Brettflan Date: Sat, 26 Jan 2013 20:38:04 -0600 Subject: [PATCH] Added missing new permissions, and minor cleanup; switched Rel enum values back to previous values, for the sake of other plugins which might check against the actual enum value (for better compatibility with both 1.6.x and 1.7.x+ versions) IMPORTANT NOTE: Existing plugin users who are upgrading to this version will likely need to grant default permissions for recruits, like so: f config factionPermDefaults door recruit f config factionPermDefaults button recruit f config factionPermDefaults lever recruit f config factionPermDefaults build recruit --- plugin.yml | 2 ++ src/com/massivecraft/factions/FPlayer.java | 6 +++--- src/com/massivecraft/factions/struct/Rel.java | 8 ++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/plugin.yml b/plugin.yml index 5c507e8e..9e5ae815 100644 --- a/plugin.yml +++ b/plugin.yml @@ -24,6 +24,7 @@ permissions: factions.config: {description: change a conf.json setting} factions.create: {description: create a new faction} factions.deinvite: {description: remove a pending invitation} + factions.demote: {description: demote lesser members in your faction} factions.description: {description: change the faction description} factions.disband: {description: disband a faction} factions.flag: {description: read faction flags} @@ -55,6 +56,7 @@ permissions: factions.power: {description: show player power info} factions.power.any: {description: view an other players power level} factions.powerboost: {description: apply permanent power bonus/penalty to specified player or faction} + factions.promote: {description: promote lesser members in your faction} factions.relation: {description: set relation wish to another faction} factions.reload: {description: reload data file(s) from disk} factions.save: {description: save all data to disk} diff --git a/src/com/massivecraft/factions/FPlayer.java b/src/com/massivecraft/factions/FPlayer.java index 3ba73fc1..bc06fce5 100644 --- a/src/com/massivecraft/factions/FPlayer.java +++ b/src/com/massivecraft/factions/FPlayer.java @@ -143,9 +143,9 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator if (doSpoutUpdate) { - SpoutFeatures.updateTitle(this, null); - SpoutFeatures.updateTitle(null, this); - SpoutFeatures.updateCape(this.getPlayer(), null); + SpoutFeatures.updateTitle(this, null); + SpoutFeatures.updateTitle(null, this); + SpoutFeatures.updateCape(this.getPlayer(), null); } } diff --git a/src/com/massivecraft/factions/struct/Rel.java b/src/com/massivecraft/factions/struct/Rel.java index 4ddfb524..f38380f1 100644 --- a/src/com/massivecraft/factions/struct/Rel.java +++ b/src/com/massivecraft/factions/struct/Rel.java @@ -6,10 +6,10 @@ import com.massivecraft.factions.Conf; public enum Rel { - LEADER (80, "your faction leader", "your faction leader", "", ""), - OFFICER (70, "an officer in your faction", "officers in your faction", "", ""), - MEMBER (60, "a member in your faction", "members in your faction", "your faction", "your factions"), - RECRUIT (50, "a recruit in your faction", "recruits in your faction", "", ""), + LEADER (70, "your faction leader", "your faction leader", "", ""), + OFFICER (60, "an officer in your faction", "officers in your faction", "", ""), + MEMBER (50, "a member in your faction", "members in your faction", "your faction", "your factions"), + RECRUIT (45, "a recruit in your faction", "recruits in your faction", "", ""), ALLY (40, "an ally", "allies", "an allied faction", "allied factions"), TRUCE (30, "someone in truce with you", "those in truce with you", "a faction in truce", "factions in truce"), NEUTRAL (20, "someone neutral to you", "those neutral to you", "a neutral faction", "neutral factions"),