Anime-Game-Servers/Grasscutter-Quests
1
0
Fork 0
mirror of https://github.com/Anime-Game-Servers/Grasscutter-Quests.git synced 2024-11-27 06:20:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add debug and error messages and fix a loading bug

Browse Source
This commit is contained in:
StartForKiller 2023-01-24 20:51:54 +01:00
parent a1d88f79f7
commit 5dfd2d31f5
No known key found for this signature in database
GPG Key ID: CE5EA6FC54AAB4F0
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/emu/grasscutter/game/world/Scene.java
View File

@ -785,7 +785,7 @@ public class Scene {
// Load suites
//int suite = group.findInitSuiteIndex(0);
this.getScriptManager().refreshGroup(groupInstance, groupInstance.getActiveSuiteId(), false); //This is what the official server does
this.getScriptManager().refreshGroup(groupInstance, 0, false); //This is what the official server does
this.loadedGroups.add(group);
}

8
src/main/java/emu/grasscutter/scripts/SceneScriptManager.java
View File

@ -203,6 +203,7 @@ public class SceneScriptManager {
var suiteData = group.getSuiteByIndex(suiteIndex);
if (suiteData == null) {
Grasscutter.getLogger().warn("Group {} suite {} not found", group.id, suiteIndex);
return 0;
}
@ -220,6 +221,7 @@ public class SceneScriptManager {
if(waitForOne && (groupInstance.getTargetSuiteId() == 0 || prevSuiteIndex != groupInstance.getTargetSuiteId())) {
groupInstance.setTargetSuiteId(suiteIndex);
Grasscutter.getLogger().debug("Group {} suite {} wating one more refresh", group.id, suiteIndex);
return 0;
}
@ -239,9 +241,11 @@ public class SceneScriptManager {
public boolean refreshGroupSuite(int groupId, int suiteId, GameQuest quest) {
var targetGroupInstance = getGroupInstanceById(groupId);
if (targetGroupInstance == null) {
Grasscutter.getLogger().warn("trying to regresh group suite {} in an unloaded and uncached group {} in scene {}", suiteId, groupId, getScene().getId());
return false;
getGroupById(groupId); //Load the group, this ensures an instance is created and the if neccesary unloaded, but the suite data is stored
targetGroupInstance = getGroupInstanceById(groupId);
Grasscutter.getLogger().debug("trying to regresh group suite {} in an unloaded and uncached group {} in scene {}", suiteId, groupId, getScene().getId());
} else {
Grasscutter.getLogger().debug("Refreshing group {} suite {}", groupId, suiteId);
suiteId = refreshGroup(targetGroupInstance, suiteId, false); //If suiteId is zero, the value of suiteId changes
quest.getOwner().sendPacket(new PacketGroupSuiteNotify(groupId, suiteId));
}