Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-15 01:02:34 +08:00
Code Issues Projects Releases Wiki Activity

Fix mirror tower stages; fix tower time challenge and star scoring (#2406)

Browse Source
This commit is contained in:
longfruit
2023-10-19 06:18:12 -07:00
committed by GitHub
Unverified
parent bc8e7c21ce
commit f5703e5964
13 changed files with 264 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/emu/grasscutter/scripts/SceneScriptManager.java
+4 -4
View File
@@ -807,11 +807,11 @@ public class SceneScriptManager {
}
}
// Events
public void callEvent(int groupId, int eventType) {
callEvent(new ScriptArgs(groupId, eventType));
public Future<?> callEvent(int groupId, int eventType) {
return callEvent(new ScriptArgs(groupId, eventType));
}
public void callEvent(@Nonnull ScriptArgs params) {
public Future<?> callEvent(@Nonnull ScriptArgs params) {
/**
* We use ThreadLocal to trans SceneScriptManager context to ScriptLib, to avoid eval script for
* every groups' trigger in every scene instances. But when callEvent is called in a ScriptLib
@@ -819,7 +819,7 @@ public class SceneScriptManager {
* not get it. e.g. CallEvent -> set -> ScriptLib.xxx -> CallEvent -> set -> remove -> NPE ->
* (remove) So we use thread pool to clean the stack to avoid this new issue.
*/
eventExecutor.submit(() -> this.realCallEvent(params));
return eventExecutor.submit(() -> this.realCallEvent(params));
}
private void realCallEvent(@Nonnull ScriptArgs params) {