From 0ffaba44eaf34faa7978cd2ffc94281844b5a2dc Mon Sep 17 00:00:00 2001
From: Melledy <52122272+Melledy@users.noreply.github.com>
Date: Fri, 13 May 2022 06:33:12 -0700
Subject: [PATCH] Implement QUEST_CONTENT_FINISH_PLOT

---
 .../game/quest/content/ContentFinishPlot.java   | 17 +++++++++++++++++
 .../server/packet/recv/HandlerNpcTalkReq.java   |  2 ++
 2 files changed, 19 insertions(+)
 create mode 100644 src/main/java/emu/grasscutter/game/quest/content/ContentFinishPlot.java

diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentFinishPlot.java b/src/main/java/emu/grasscutter/game/quest/content/ContentFinishPlot.java
new file mode 100644
index 000000000..d8e0cd4e5
--- /dev/null
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentFinishPlot.java
@@ -0,0 +1,17 @@
+package emu.grasscutter.game.quest.content;
+
+import emu.grasscutter.data.def.QuestData.QuestCondition;
+import emu.grasscutter.game.quest.QuestValue;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.enums.QuestTrigger;
+import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
+
+@QuestValue(QuestTrigger.QUEST_CONTENT_FINISH_PLOT)
+public class ContentFinishPlot extends QuestBaseHandler {
+
+	@Override
+	public boolean execute(GameQuest quest, QuestCondition condition, int... params) {
+		return condition.getParam()[0] == params[0];
+	}
+	
+}
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerNpcTalkReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerNpcTalkReq.java
index 82248c98c..3dae7fe10 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerNpcTalkReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerNpcTalkReq.java
@@ -16,7 +16,9 @@ public class HandlerNpcTalkReq extends PacketHandler {
 	public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
 		NpcTalkReq req = NpcTalkReq.parseFrom(payload);
 		
+		// Why are there 2 quest triggers that do the same thing...
 		session.getPlayer().getQuestManager().triggerEvent(QuestTrigger.QUEST_CONTENT_COMPLETE_TALK, req.getTalkId());
+		session.getPlayer().getQuestManager().triggerEvent(QuestTrigger.QUEST_CONTENT_FINISH_PLOT, req.getTalkId());
 
 		session.send(new PacketNpcTalkRsp(req.getNpcEntityId(), req.getTalkId(), req.getEntityId()));
 	}