A deinvite bugfix and some color formating misses
This commit is contained in:
parent
bcd52a1fbd
commit
db03d466ba
@ -1,3 +1,3 @@
|
|||||||
name: Factions
|
name: Factions
|
||||||
version: 1.0 alpha
|
version: 1.0 beta1
|
||||||
main: com.bukkit.mcteam.factions.Factions
|
main: com.bukkit.mcteam.factions.Factions
|
@ -537,9 +537,9 @@ public class Commands {
|
|||||||
// Inform all players
|
// Inform all players
|
||||||
for (Follower follower : Follower.getAll()) {
|
for (Follower follower : Follower.getAll()) {
|
||||||
if (follower.factionId == me.factionId) {
|
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 {
|
} 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) {
|
} else if (targetRole == Role.MODERATOR) {
|
||||||
@ -629,7 +629,7 @@ public class Commands {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Board.unclaim(coord);
|
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) {
|
public static void relation(Follower me, Relation whishedRelation, String otherFactionName) {
|
||||||
|
@ -177,10 +177,10 @@ public class Conf {
|
|||||||
aliasTrue.add("on");
|
aliasTrue.add("on");
|
||||||
aliasTrue.add("+");
|
aliasTrue.add("+");
|
||||||
|
|
||||||
powerPerLand = 1; // 1 power grants one land
|
powerPerLand = 1; // 1 power grants one land Perhaps this should not even be a config value...
|
||||||
powerPerPlayer = 5; // One player has 5 power
|
powerPerPlayer = 10; // One player has 10 power
|
||||||
powerPerMinute = 0.2; // Default health rate... it takes 5 min to heal one death
|
powerPerMinute = 0.2; // Default health rate... it takes 10 min to heal one death
|
||||||
powerPerDeath = 1; //A death makes you loose 2 power
|
powerPerDeath = 2; //A death makes you loose 2 power
|
||||||
powerDefaultBonus = 0; //A faction normally has a power bonus
|
powerDefaultBonus = 0; //A faction normally has a power bonus
|
||||||
|
|
||||||
territoryProtectedMaterials.add(Material.WOODEN_DOOR);
|
territoryProtectedMaterials.add(Material.WOODEN_DOOR);
|
||||||
|
@ -142,7 +142,7 @@ public class Faction {
|
|||||||
public ArrayList<String> deinvite(Follower follower) {
|
public ArrayList<String> deinvite(Follower follower) {
|
||||||
ArrayList<String> errors = new ArrayList<String>();
|
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+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());
|
errors.add(Conf.colorSystem+"You might want to "+Conf.colorCommand+Conf.aliasBase.get(0)+" "+Conf.aliasKick.get(0)+Conf.colorParameter+" "+follower.getName());
|
||||||
}
|
}
|
||||||
|
@ -259,7 +259,7 @@ public class Follower {
|
|||||||
return errors;
|
return errors;
|
||||||
}
|
}
|
||||||
|
|
||||||
return follower.getFaction().deinvite(follower);
|
return this.getFaction().deinvite(follower);
|
||||||
}
|
}
|
||||||
|
|
||||||
public ArrayList<String> kick(Follower follower) {
|
public ArrayList<String> kick(Follower follower) {
|
||||||
|
Loading…
Reference in New Issue
Block a user