diff --git a/Server/src/main/content/region/kandarin/ardougne/quest/plaguecity/PlagueCityListeners.kt b/Server/src/main/content/region/kandarin/ardougne/quest/plaguecity/PlagueCityListeners.kt index 99270a12b..0c8ef60a0 100644 --- a/Server/src/main/content/region/kandarin/ardougne/quest/plaguecity/PlagueCityListeners.kt +++ b/Server/src/main/content/region/kandarin/ardougne/quest/plaguecity/PlagueCityListeners.kt @@ -276,8 +276,7 @@ class PlagueCityListeners : InteractionListener { } } 1 -> playerl(FacialExpression.NEUTRAL, "I'm a friend of Jethick's, I have come to return a book he borrowed.").also { stage++ } - // todo change this back after sendItemDialogue is fixed for having a single line before See #1885 - 2 -> npc(FacialExpression.FRIENDLY, "", "Oh... why didn't you say, come in then.", "").also { stage++ } + 2 -> npc(FacialExpression.FRIENDLY, "Oh... why didn't you say, come in then.").also { stage++ } 3 -> sendItemDialogue(player!!, Items.BOOK_1509, "You hand the book to Ted as you enter.").also { DoorActionHandler.handleAutowalkDoor(player, getScenery(2531, 3328, 0)) setQuestStage(player!!, Quests.PLAGUE_CITY, 9) diff --git a/Server/src/main/core/game/dialogue/DialogueInterpreter.java b/Server/src/main/core/game/dialogue/DialogueInterpreter.java index 85a0e94a8..ccc4a94c0 100644 --- a/Server/src/main/core/game/dialogue/DialogueInterpreter.java +++ b/Server/src/main/core/game/dialogue/DialogueInterpreter.java @@ -348,7 +348,7 @@ public final class DialogueInterpreter { ItemDefinition itemDef = ItemDefinition.forId(item.getId()); player.getPacketDispatch().sendItemOnInterface(item.getId(), item.getAmount(), interfaceId, 2); player.getPacketDispatch().sendAngleOnInterface(interfaceId, 2, itemDef.getModelZoom() / 2, itemDef.getModelRotationX(), itemDef.getModelRotationY()); - player.getPacketDispatch().sendRepositionOnInterface(interfaceId, 2, 45, 46); + player.getPacketDispatch().sendRepositionOnInterface(interfaceId, 2, 45, 45); // Hide the second item which seems to be used for double items (child 1) player.getPacketDispatch().sendInterfaceConfig(interfaceId, 1, true); // Open the chatbox only after everything is set to avoid lag and flashing default strings (Line 1, Title) @@ -524,11 +524,12 @@ public final class DialogueInterpreter { player.getPacketDispatch().sendInterfaceConfig(interfaceId, 1, true); player.getPacketDispatch().sendInterfaceConfig(interfaceId, 2, false); player.getPacketDispatch().sendAnimationInterface(expression, interfaceId, 2); - player.getPacketDispatch().sendItemOnInterface(-1, 1, interfaceId, 1); if (npc) { player.getPacketDispatch().sendItemOnInterface(-1, 1, interfaceId, 1); - player.getPacketDispatch().sendRepositionOnInterface(interfaceId, 2, 45, 45); + player.getPacketDispatch().sendItemOnInterface(-1, 1, interfaceId, 2); player.getPacketDispatch().sendNpcOnInterface(npcId, interfaceId, 2); + player.getPacketDispatch().sendRepositionOnInterface(interfaceId, 2, 45, 45); + player.getPacketDispatch().sendAngleOnInterface(interfaceId, 2, 2150, 40, 1882); player.getPacketDispatch().sendString(NPCDefinition.forId(npcId).getName(), interfaceId, 3); } else { player.getPacketDispatch().sendRepositionOnInterface(interfaceId, 2, 426, 45); // 423 is 47 * 9