Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-09-27 06:42:57 +02:00
Code Issues Projects Releases Wiki Activity

Stop the conversation when the editor stops

Browse Source
This commit is contained in:
fullwall 2012-10-26 21:55:41 +08:00
parent 35844ac6c5
commit d7f765bfbd
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,7 @@ import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.conversations.Conversation;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
@ -89,6 +90,7 @@ public class LinearWaypointProvider implements WaypointProvider {
private final class LinearWaypointEditor extends WaypointEditor {
boolean editing = true;
int editingSlot = waypoints.size() - 1;
Conversation conversation;
private final Player player;
private boolean showPath;
Map<Waypoint, Entity> waypointMarkers = Maps.newHashMap();
@ -125,6 +127,8 @@ public class LinearWaypointProvider implements WaypointProvider {
public void end() {
if (!editing)
return;
if (conversation != null)
conversation.abandon();
Messaging.sendTr(player, Messages.LINEAR_WAYPOINT_EDITOR_END);
editing = false;
if (!showPath)
@ -183,7 +187,7 @@ public class LinearWaypointProvider implements WaypointProvider {
Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), new Runnable() {
@Override
public void run() {
TriggerEditPrompt.start(player, LinearWaypointEditor.this);
conversation = TriggerEditPrompt.start(player, LinearWaypointEditor.this);
}
}, 1);
return;

3
src/main/java/net/citizensnpcs/trait/waypoint/triggers/TriggerEditPrompt.java
View File

@ -47,10 +47,11 @@ public class TriggerEditPrompt extends StringPrompt {
return "";
}
public static void start(Player player, WaypointEditor editor) {
public static Conversation start(Player player, WaypointEditor editor) {
final Conversation conversation = new ConversationFactory(CitizensAPI.getPlugin())
.withLocalEcho(false).withEscapeSequence("exit").withModality(false)
.withFirstPrompt(new TriggerEditPrompt(editor)).buildConversation(player);
conversation.begin();
return conversation;
}
}