Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-27 05:05:20 +01:00
Code Issues Projects Releases Wiki Activity

Fix logic

Browse Source
This commit is contained in:
fullwall 2012-02-28 20:11:25 +08:00
parent a795111e1d
commit d1fc04e9ec
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointProvider.java
View File

@ -6,6 +6,7 @@ import net.citizensnpcs.api.ai.AI;
import net.citizensnpcs.api.ai.NavigationCallback;
import net.citizensnpcs.api.util.DataKey;
import net.citizensnpcs.editor.Editor;
import net.citizensnpcs.util.Messaging;
import net.citizensnpcs.util.StorageUtils;
import org.bukkit.ChatColor;
@ -24,7 +25,7 @@ public class LinearWaypointProvider implements WaypointProvider {
return new Editor() {
@Override
public void begin() {
player.sendMessage(ChatColor.GREEN + "Entered the linear waypoint editor!");
player.sendMessage(ChatColor.AQUA + "Entered the linear waypoint editor!");
player.sendMessage(ChatColor.GREEN + "Left click to add waypoint, right click to remove.");
}
@ -40,11 +41,11 @@ public class LinearWaypointProvider implements WaypointProvider {
return;
if (event.getAction() == Action.LEFT_CLICK_BLOCK) {
waypoints.add(new Waypoint(event.getClickedBlock().getLocation()));
player.sendMessage(ChatColor.GREEN + "Added a waypoint.");
Messaging.send(player, "<e>Added<a> a waypoint.");
} else if (waypoints.size() > 0) {
waypoints.remove(waypoints.size() - 1);
player.sendMessage(ChatColor.GREEN
+ String.format("Removed a waypoint ({0} remaining)", waypoints.size()));
Messaging.send(player,
String.format("<e>Removed<a> a waypoint (<e>%d<a> remaining)", waypoints.size()));
}
}
};
@ -92,7 +93,7 @@ public class LinearWaypointProvider implements WaypointProvider {
@Override
public void onAttach(AI ai) {
if (attached != null && attached != ai) {
if (attached == null || attached != ai) {
executing = false;
currentIndex = -1;
cycle();

3
src/main/java/net/citizensnpcs/util/StringHelper.java
View File

@ -63,8 +63,9 @@ public class StringHelper {
public static String parseColors(Object string) {
String parsed = string.toString();
for (ChatColor color : ChatColor.values())
for (ChatColor color : ChatColor.values()) {
parsed = parsed.replace("<" + color.getChar() + ">", color.toString());
}
return parsed;
}