Upstream/Factions
1
0
Fork 0
mirror of https://github.com/MassiveCraft/Factions.git synced 2024-06-28 23:44:46 +02:00
Code Issues Projects Releases Wiki Activity

A deinvite bugfix and some color formating misses

Browse Source
This commit is contained in:
Olof Larsson 2011-02-06 16:07:10 +01:00
parent bcd52a1fbd
commit db03d466ba
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugin.yml
View File

@ -1,3 +1,3 @@
name: Factions
version: 1.0 alpha
version: 1.0 beta1
main: com.bukkit.mcteam.factions.Factions

6
src/com/bukkit/mcteam/factions/Commands.java
View File

@ -537,9 +537,9 @@ public class Commands {
// Inform all players
for (Follower follower : Follower.getAll()) {
if (follower.factionId == me.factionId) {
follower.sendMessage(Conf.colorMember+me.getFullName()+Conf.colorSystem+" gave "+Conf.colorMember+targetFollower.getFullName()+" the leadership of your faction.");
follower.sendMessage(Conf.colorMember+me.getFullName()+Conf.colorSystem+" gave "+Conf.colorMember+targetFollower.getFullName()+Conf.colorSystem+" the leadership of your faction.");
} else {
follower.sendMessage(me.getFullName(follower)+Conf.colorSystem+" gave "+targetFollower.getFullName(follower)+" the leadership of "+me.getFaction().getName(follower));
follower.sendMessage(me.getFullName(follower)+Conf.colorSystem+" gave "+targetFollower.getFullName(follower)+Conf.colorSystem+" the leadership of "+me.getFaction().getName(follower));
}
}
} else if (targetRole == Role.MODERATOR) {
@ -629,7 +629,7 @@ public class Commands {
}
Board.unclaim(coord);
me.sendMessage(Conf.colorAction+"Successfully unclaimed");
me.getFaction().sendMessage(Conf.colorMember+me.getFullName()+Conf.colorSystem+" unclaimed some land...");
}
public static void relation(Follower me, Relation whishedRelation, String otherFactionName) {

8
src/com/bukkit/mcteam/factions/entities/Conf.java
View File

@ -177,10 +177,10 @@ public class Conf {
aliasTrue.add("on");
aliasTrue.add("+");
powerPerLand = 1; // 1 power grants one land
powerPerPlayer = 5; // One player has 5 power
powerPerMinute = 0.2; // Default health rate... it takes 5 min to heal one death
powerPerDeath = 1; //A death makes you loose 2 power
powerPerLand = 1; // 1 power grants one land Perhaps this should not even be a config value...
powerPerPlayer = 10; // One player has 10 power
powerPerMinute = 0.2; // Default health rate... it takes 10 min to heal one death
powerPerDeath = 2; //A death makes you loose 2 power
powerDefaultBonus = 0; //A faction normally has a power bonus
territoryProtectedMaterials.add(Material.WOODEN_DOOR);

2
src/com/bukkit/mcteam/factions/entities/Faction.java
View File

@ -142,7 +142,7 @@ public class Faction {
public ArrayList<String> deinvite(Follower follower) {
ArrayList<String> errors = new ArrayList<String>();
if (follower.getFaction().equals(this)) {
if (follower.getFaction() == this) {
errors.add(Conf.colorSystem+follower.getFullName()+" is already a member of "+this.getName());
errors.add(Conf.colorSystem+"You might want to "+Conf.colorCommand+Conf.aliasBase.get(0)+" "+Conf.aliasKick.get(0)+Conf.colorParameter+" "+follower.getName());
}

2
src/com/bukkit/mcteam/factions/entities/Follower.java
View File

@ -259,7 +259,7 @@ public class Follower {
return errors;
}
return follower.getFaction().deinvite(follower);
return this.getFaction().deinvite(follower);
}
public ArrayList<String> kick(Follower follower) {