mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-05-16 13:22:52 +08:00
Fix Lua require, Fix monster abilities & Fix ServerLuaCall
This commit is contained in:
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user