A deinvite bugfix and some color formating misses

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

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);

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());
}

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) {