Rx3/Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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)

Browse Source 
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
This commit is contained in:
Brettflan 2013-01-26 20:38:04 -06:00
parent 5da296e8ca
commit 15024bf880
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugin.yml
View File

@ -24,6 +24,7 @@ permissions:
factions.config: {description: change a conf.json setting} factions.config: {description: change a conf.json setting}
factions.create: {description: create a new faction} factions.create: {description: create a new faction}
factions.deinvite: {description: remove a pending invitation} factions.deinvite: {description: remove a pending invitation}
factions.demote: {description: demote lesser members in your faction}
factions.description: {description: change the faction description} factions.description: {description: change the faction description}
factions.disband: {description: disband a faction} factions.disband: {description: disband a faction}
factions.flag: {description: read faction flags} factions.flag: {description: read faction flags}
@ -55,6 +56,7 @@ permissions:
factions.power: {description: show player power info} factions.power: {description: show player power info}
factions.power.any: {description: view an other players power level} factions.power.any: {description: view an other players power level}
factions.powerboost: {description: apply permanent power bonus/penalty to specified player or faction} 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.relation: {description: set relation wish to another faction}
factions.reload: {description: reload data file(s) from disk} factions.reload: {description: reload data file(s) from disk}
factions.save: {description: save all data to disk} factions.save: {description: save all data to disk}

6
src/com/massivecraft/factions/FPlayer.java
View File

@ -143,9 +143,9 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator
if (doSpoutUpdate) if (doSpoutUpdate)
{ {
SpoutFeatures.updateTitle(this, null); SpoutFeatures.updateTitle(this, null);
SpoutFeatures.updateTitle(null, this); SpoutFeatures.updateTitle(null, this);
SpoutFeatures.updateCape(this.getPlayer(), null); SpoutFeatures.updateCape(this.getPlayer(), null);
} }
} }

8
src/com/massivecraft/factions/struct/Rel.java
View File

@ -6,10 +6,10 @@ import com.massivecraft.factions.Conf;
public enum Rel public enum Rel
{ {
LEADER (80, "your faction leader", "your faction leader", "", ""), LEADER (70, "your faction leader", "your faction leader", "", ""),
OFFICER (70, "an officer in your faction", "officers in your faction", "", ""), OFFICER (60, "an officer in your faction", "officers in your faction", "", ""),
MEMBER (60, "a member in your faction", "members in your faction", "your faction", "your factions"), MEMBER (50, "a member in your faction", "members in your faction", "your faction", "your factions"),
RECRUIT (50, "a recruit in your faction", "recruits in your faction", "", ""), RECRUIT (45, "a recruit in your faction", "recruits in your faction", "", ""),
ALLY (40, "an ally", "allies", "an allied faction", "allied factions"), 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"), 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"), NEUTRAL (20, "someone neutral to you", "those neutral to you", "a neutral faction", "neutral factions"),