yuriy/2009scape
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Miscellaneous farming fixes

Browse Source
This commit is contained in:
Ceikry
2021-07-30 12:42:46 +00:00
parent 2210f8af85
commit aece20453c
11 changed files with 213 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/java/core/game/content/dialogue/DialogueInterpreter.java
+4 -1
View File
@@ -204,6 +204,7 @@ public final class DialogueInterpreter {
public boolean close() {
if (dialogue != null || dialogueStage != null) {
actions.clear();
if (player.getInterfaceManager().getChatbox() != null && player.getInterfaceManager().getChatbox().getCloseEvent() != null) {
return true;
}
@@ -211,8 +212,10 @@ public final class DialogueInterpreter {
dialogueStage = null;
player.getInterfaceManager().closeChatbox();
}
if (dialogue != null && dialogue.close()) {
if (dialogue != null) {
DialoguePlugin d = dialogue;
dialogue = null;
d.close();
}
}
return dialogue == null && dialogueStage == null;
Server/src/main/java/core/game/content/dialogue/DialoguePlugin.java
+1
View File
@@ -122,6 +122,7 @@ public abstract class DialoguePlugin implements Plugin<Player> {
public boolean close() {
player.getInterfaceManager().closeChatbox();
player.getInterfaceManager().openChatbox(137);
if(file != null) file.end();
finished = true;
return true;
}