Send page /npc t ext

CitizensDev · Dec 12, 2022 · 505b61d · 505b61d
1 parent b78312b
commit 505b61d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/main/src/main/java/net/citizensnpcs/trait/text/Text.java b/main/src/main/java/net/citizensnpcs/trait/text/Text.java
@@ -10,8 +10,6 @@
 import org.bukkit.GameMode;
 import org.bukkit.command.CommandSender;
 import org.bukkit.conversations.Conversation;
-import org.bukkit.conversations.ConversationAbandonedEvent;
-import org.bukkit.conversations.ConversationAbandonedListener;
 import org.bukkit.conversations.ConversationFactory;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -40,7 +38,7 @@
  * Persists text metadata, i.e. text that will be said by an NPC on certain triggers.
  */
 @TraitName("text")
-public class Text extends Trait implements Runnable, Listener, ConversationAbandonedListener {
+public class Text extends Trait implements Runnable, Listener {
     private final Map<UUID, Long> cooldowns = Maps.newHashMap();
     private int currentIndex;
     private int delay = -1;
@@ -68,10 +66,6 @@ public void add(String string) {
         text.add(string);
     }
 
-    @Override
-    public void conversationAbandoned(ConversationAbandonedEvent event) {
-    }
-
     /**
      * Edit the text at a given index to a new text.
      *
@@ -88,8 +82,8 @@ public void edit(int index, String newText) {
      * Builds a text editor in game for the supplied {@link Player}.
      */
     public Editor getEditor(final Player player) {
-        final Conversation conversation = new ConversationFactory(plugin).addConversationAbandonedListener(this)
-                .withLocalEcho(false).withEscapeSequence("/npc text").withEscapeSequence("exit").withModality(false)
+        final Conversation conversation = new ConversationFactory(plugin).withLocalEcho(false)
+                .withEscapeSequence("/npc text").withEscapeSequence("exit").withModality(false)
                 .withFirstPrompt(new TextBasePrompt(this)).buildConversation(player);
         return new Editor() {
             @Override

diff --git a/main/src/main/java/net/citizensnpcs/trait/text/TextBasePrompt.java b/main/src/main/java/net/citizensnpcs/trait/text/TextBasePrompt.java
@@ -91,7 +91,6 @@ public Prompt acceptInput(ConversationContext context, String original) {
                     Messaging.sendErrorTr(sender, Messages.TEXT_EDITOR_INVALID_PAGE);
                 }
                 context.setSessionData("page", page);
-                return this;
             } catch (NumberFormatException e) {
                 Messaging.sendErrorTr(sender, Messages.TEXT_EDITOR_INVALID_PAGE);
             }