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

Merge branch 'talking' into dev-4.0

Browse Source
This commit is contained in:
KingRainbow44
2023-08-15 20:46:38 -04:00
parent 407c1b3a86 e0f8c03e39
commit 70eb0f2b16
38 changed files with 1213 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,14 +1,12 @@
package emu.grasscutter.scripts.data.controller;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.*;
import emu.grasscutter.game.entity.GameEntity;
import emu.grasscutter.game.props.ElementType;
import emu.grasscutter.scripts.ScriptLib;
import emu.grasscutter.scripts.ScriptLoader;
import javax.script.Bindings;
import javax.script.CompiledScript;
import org.luaj.vm2.LuaError;
import org.luaj.vm2.LuaValue;
import emu.grasscutter.scripts.*;
import org.luaj.vm2.*;
import javax.script.*;
public class EntityController {
private transient CompiledScript entityController;
@@ -38,9 +36,11 @@ public class EntityController {
}
public int onClientExecuteRequest(GameEntity entity, int param1, int param2, int param3) {
Grasscutter.getLogger()
if (DebugConstants.LOG_LUA_SCRIPTS) {
Grasscutter.getLogger()
.debug(
"Request on {}, {}: {}", entity.getGroupId(), param1, entity.getPosition().toString());
"Request on {}, {}: {}", entity.getGroupId(), param1, entity.getPosition().toString());
}
LuaValue value =
callControllerScriptFunc(
entity,