Fix Lua require, Fix monster abilities & Fix ServerLuaCall

This commit is contained in:
KingRainbow44
2023-08-27 02:39:56 -04:00
Unverified
parent 49c1daede4
commit 1844cb43f7
15 changed files with 303 additions and 165 deletions
@@ -1,8 +1,5 @@
package emu.grasscutter.data;
import static emu.grasscutter.utils.FileUtils.*;
import static emu.grasscutter.utils.lang.Language.translate;
import com.google.gson.annotations.SerializedName;
import com.google.gson.reflect.TypeToken;
import emu.grasscutter.Grasscutter;
@@ -23,6 +20,10 @@ import emu.grasscutter.scripts.*;
import emu.grasscutter.utils.*;
import it.unimi.dsi.fastutil.Pair;
import it.unimi.dsi.fastutil.ints.*;
import lombok.*;
import org.reflections.Reflections;
import javax.script.*;
import java.io.*;
import java.nio.file.*;
import java.util.*;
@@ -30,9 +31,9 @@ import java.util.Map.Entry;
import java.util.concurrent.*;
import java.util.regex.Pattern;
import java.util.stream.*;
import javax.script.*;
import lombok.*;
import org.reflections.Reflections;
import static emu.grasscutter.utils.FileUtils.*;
import static emu.grasscutter.utils.lang.Language.translate;
public final class ResourceLoader {
@@ -780,7 +781,7 @@ public final class ResourceLoader {
if (cs == null) return;
try {
cs.eval(bindings);
ScriptLoader.eval(cs, bindings);
// these are Map<String, class>
var teleportDataMap =
ScriptLoader.getSerializer()
@@ -964,7 +965,7 @@ public final class ResourceLoader {
}
try {
cs.eval(bindings);
ScriptLoader.eval(cs, bindings);
// these are Map<String, class>
var replacementsMap =
ScriptLoader.getSerializer()