From 478116c41802f1db7156d94ec64b969e39366761 Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Sun, 13 Feb 2011 17:02:51 +0100 Subject: [PATCH] A color format fix and clas not found def fix --- src/com/bukkit/mcteam/factions/entities/Faction.java | 6 +----- src/com/bukkit/mcteam/factions/entities/Follower.java | 3 +-- .../mcteam/factions/listeners/FactionsEntityListener.java | 5 ++--- .../mcteam/factions/listeners/FactionsPlayerListener.java | 4 +++- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/com/bukkit/mcteam/factions/entities/Faction.java b/src/com/bukkit/mcteam/factions/entities/Faction.java index a1449317..5263c7f2 100644 --- a/src/com/bukkit/mcteam/factions/entities/Faction.java +++ b/src/com/bukkit/mcteam/factions/entities/Faction.java @@ -8,8 +8,7 @@ import org.bukkit.entity.Player; import com.bukkit.mcteam.factions.Factions; import com.bukkit.mcteam.factions.struct.Relation; import com.bukkit.mcteam.factions.struct.Role; -import com.bukkit.mcteam.factions.util.Log; -import com.bukkit.mcteam.factions.util.TextUtil; +import com.bukkit.mcteam.factions.util.*; import com.bukkit.mcteam.util.ChatFixUtil; public class Faction { @@ -113,9 +112,6 @@ public class Faction { public ArrayList invite(Follower follower) { // TODO Move out ArrayList errors = new ArrayList(); - Log.debug("follower.getFaction().id"+follower.getFaction().id); - Log.debug("this.id"+this.id); - if (follower.getFaction().equals(this)) { // error här? errors.add(Conf.colorSystem+follower.getName()+" is already a member of "+this.getTag()); } diff --git a/src/com/bukkit/mcteam/factions/entities/Follower.java b/src/com/bukkit/mcteam/factions/entities/Follower.java index efcfcc90..07bf797e 100644 --- a/src/com/bukkit/mcteam/factions/entities/Follower.java +++ b/src/com/bukkit/mcteam/factions/entities/Follower.java @@ -7,7 +7,6 @@ import org.bukkit.entity.Player; import com.bukkit.mcteam.factions.Factions; import com.bukkit.mcteam.factions.struct.*; -import com.bukkit.mcteam.factions.util.Log; import com.bukkit.mcteam.util.ChatFixUtil; public class Follower { @@ -215,7 +214,7 @@ public class Follower { } else if (this.power < this.getPowerMin()) { this.power = this.getPowerMin(); } - Log.debug("Power of "+this.getName()+" is now: "+this.power); + //Log.debug("Power of "+this.getName()+" is now: "+this.power); } public double getPowerMax() { diff --git a/src/com/bukkit/mcteam/factions/listeners/FactionsEntityListener.java b/src/com/bukkit/mcteam/factions/listeners/FactionsEntityListener.java index 21246f35..5ef5818f 100644 --- a/src/com/bukkit/mcteam/factions/listeners/FactionsEntityListener.java +++ b/src/com/bukkit/mcteam/factions/listeners/FactionsEntityListener.java @@ -14,7 +14,6 @@ import com.bukkit.mcteam.factions.Factions; import com.bukkit.mcteam.factions.entities.Conf; import com.bukkit.mcteam.factions.entities.Follower; import com.bukkit.mcteam.factions.struct.Relation; -import com.bukkit.mcteam.factions.util.Log; public class FactionsEntityListener extends EntityListener { public Factions plugin; @@ -80,7 +79,7 @@ public class FactionsEntityListener extends EntityListener { Follower attacker = Follower.get((Player)damager); Relation relation = defender.getRelation(attacker); - Log.debug(attacker.getName() + " attacked " + defender.getName()); + //Log.debug(attacker.getName() + " attacked " + defender.getName()); // Players without faction may be hurt anywhere if (defender.factionId == 0) { @@ -95,7 +94,7 @@ public class FactionsEntityListener extends EntityListener { // You can not hurt neutrals in their own territory. if (relation == Relation.NEUTRAL && defender.isInOwnTerritory()) { - attacker.sendMessage(Conf.colorSystem+"You can't hurt "+relation.getColor()+defender.getNameAndRelevant(attacker)+" in their own territory."); + attacker.sendMessage(Conf.colorSystem+"You can't hurt "+relation.getColor()+defender.getNameAndRelevant(attacker)+Conf.colorSystem+" in their own territory."); defender.sendMessage(attacker.getNameAndRelevant(defender)+Conf.colorSystem+" tried to hurt you."); return false; } diff --git a/src/com/bukkit/mcteam/factions/listeners/FactionsPlayerListener.java b/src/com/bukkit/mcteam/factions/listeners/FactionsPlayerListener.java index 902b3dab..d9e3e706 100644 --- a/src/com/bukkit/mcteam/factions/listeners/FactionsPlayerListener.java +++ b/src/com/bukkit/mcteam/factions/listeners/FactionsPlayerListener.java @@ -13,7 +13,9 @@ import org.bukkit.event.player.PlayerMoveEvent; import com.bukkit.mcteam.factions.Commands; import com.bukkit.mcteam.factions.Factions; import com.bukkit.mcteam.factions.entities.*; -import com.bukkit.mcteam.factions.util.*; +import com.bukkit.mcteam.factions.util.TextUtil; +import com.bukkit.mcteam.factions.util.Log; + public class FactionsPlayerListener extends PlayerListener{ public Factions plugin;