Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-02-04 09:15:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Potentially fix issues with regions"

Browse Source 
This reverts commit 84e3823695.
This commit is contained in:
KingRainbow44
2023-05-31 23:46:12 -04:00
parent 6950e14ec4
commit 19fa9deae7
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/emu/grasscutter/game/player/Player.java
View File

@@ -710,9 +710,12 @@ public class Player implements PlayerHook, FieldFetch {
this.getQuestManager().forEachActiveQuest(quest -> { this.getQuestManager().forEachActiveQuest(quest -> {
if (quest.getTriggerData() != null && if (quest.getTriggerData() != null &&
quest.getTriggers().containsKey("ENTER_REGION_"+ region.config_id)) { quest.getTriggers().containsKey("ENTER_REGION_"+ region.config_id)) {
this.getSession().send(new PacketServerCondMeetQuestListUpdateNotify()); // If trigger hasn't been fired yet
this.getQuestManager().queueEvent(QuestContent.QUEST_CONTENT_TRIGGER_FIRE, if (!Boolean.TRUE.equals(quest.getTriggers().put("ENTER_REGION_" + region.config_id, true))) {
quest.getTriggerData().get("ENTER_REGION_" + region.config_id).getId(), 0); this.getSession().send(new PacketServerCondMeetQuestListUpdateNotify());
this.getQuestManager().queueEvent(QuestContent.QUEST_CONTENT_TRIGGER_FIRE,
quest.getTriggerData().get("ENTER_REGION_" + region.config_id).getId(), 0);
}
} }
}); });
@@ -721,9 +724,12 @@ public class Player implements PlayerHook, FieldFetch {
public void onLeaveRegion(SceneRegion region) { public void onLeaveRegion(SceneRegion region) {
this.getQuestManager().forEachActiveQuest(quest -> { this.getQuestManager().forEachActiveQuest(quest -> {
if (quest.getTriggers().containsKey("LEAVE_REGION_" + region.config_id)) { if (quest.getTriggers().containsKey("LEAVE_REGION_" + region.config_id)) {
this.getSession().send(new PacketServerCondMeetQuestListUpdateNotify()); // If trigger hasn't been fired yet
this.getQuestManager().queueEvent(QuestContent.QUEST_CONTENT_TRIGGER_FIRE, if (!Boolean.TRUE.equals(quest.getTriggers().put("LEAVE_REGION_" + region.config_id, true))) {
quest.getTriggerData().get("LEAVE_REGION_" + region.config_id).getId(), 0); this.getSession().send(new PacketServerCondMeetQuestListUpdateNotify());
this.getQuestManager().queueEvent(QuestContent.QUEST_CONTENT_TRIGGER_FIRE,
quest.getTriggerData().get("LEAVE_REGION_" + region.config_id).getId(), 0);
}
} }
}); });
} }