Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-17 17:34:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Logging changes (move levels down & add toString for some objects)

Browse Source
This commit is contained in:
KingRainbow44
2023-08-30 23:28:54 -04:00
parent aad4529b0e
commit 67c0e82dfb
5 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/emu/grasscutter/scripts/data/ScriptArgs.java
View File

@@ -1,5 +1,8 @@
package emu.grasscutter.scripts.data;
import lombok.ToString;
@ToString
public class ScriptArgs {
public int param1;
public int param2;

10
src/main/java/emu/grasscutter/scripts/data/controller/EntityController.java
View File

@@ -4,10 +4,16 @@ import emu.grasscutter.*;
import emu.grasscutter.game.entity.GameEntity;
import emu.grasscutter.game.props.ElementType;
import emu.grasscutter.scripts.*;
import javax.script.*;
import org.luaj.vm2.*;
import javax.script.*;
import java.util.Set;
public class EntityController {
private static final Set<String> SERVER_CALLED = Set.of(
"OnBeHurt", "OnDie", "OnTimer"
);
private transient CompiledScript entityController;
private transient Bindings entityControllerBindings;
@@ -92,7 +98,7 @@ public class EntityController {
error);
ret = LuaValue.valueOf(-1);
}
} else if (funcName != null && !funcName.equals("OnTimer")) {
} else if (funcName != null && !SERVER_CALLED.contains(funcName)) {
ScriptLib.logger.error(
"[LUA] unknown func in gadget {} with {} {} {} {}",
entity.getEntityTypeId(),