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

Fix conversation abandoned event

Browse Source
This commit is contained in:
fullwall 2020-10-14 15:12:41 +08:00
parent 4f345dddc1
commit 10ec4b2c29
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,6 +13,7 @@ import org.bukkit.World;
import org.bukkit.command.CommandSender;
import org.bukkit.conversations.Conversation;
import org.bukkit.conversations.ConversationAbandonedEvent;
import org.bukkit.conversations.ConversationAbandonedListener;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.block.Action;
@ -237,13 +238,6 @@ public class LinearWaypointProvider implements EnumerableWaypointProvider {
return waypoints.get(waypoints.size() - 2).getLocation();
}
@EventHandler(ignoreCancelled = true)
public void onConversationAbandoned(ConversationAbandonedEvent event) {
if (event.getSource().equals(conversation)) {
conversation = null;
}
}
@EventHandler
public void onNPCDespawn(NPCDespawnEvent event) {
if (event.getNPC().equals(npc)) {
@ -269,6 +263,12 @@ public class LinearWaypointProvider implements EnumerableWaypointProvider {
@Override
public void run() {
conversation = TriggerEditPrompt.start(player, LinearWaypointEditor.this);
conversation.addConversationAbandonedListener(new ConversationAbandonedListener() {
@Override
public void conversationAbandoned(ConversationAbandonedEvent event) {
conversation = null;
}
});
}
});
} else if (message.equalsIgnoreCase("clear")) {