Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-17 16:03:40 +08:00
Code Issues Projects Releases Wiki Activity

fix(ActionServerLuaCall.java): Handle Lua function parameter passing

Browse Source
This commit is contained in:
KingRainbow44
2024-09-28 20:18:22 -04:00
Unverified
parent 5b9d386e17
commit 10423dbada
3 changed files with 68 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/emu/grasscutter/game/ability/actions/ActionServerLuaCall.java
+32 -5
View File
@@ -8,6 +8,7 @@ import emu.grasscutter.game.entity.GameEntity;
import emu.grasscutter.scripts.ScriptLoader;
import javax.script.Bindings;
import org.luaj.vm2.LuaFunction;
import org.luaj.vm2.LuaValue;
@AbilityAction(AbilityModifierAction.Type.ServerLuaCall)
public final class ActionServerLuaCall extends AbilityActionHandler {
@@ -16,12 +17,14 @@ public final class ActionServerLuaCall extends AbilityActionHandler {
Ability ability, AbilityModifierAction action, ByteString abilityData, GameEntity target) {
var scene = target.getScene();
var scriptManager = scene.getScriptManager();
var functionName = action.funcName;
// Set the script library's manager.
var scriptLib = ScriptLoader.getScriptLib();
scriptLib.setCurrentEntity(target);
scriptLib.setSceneScriptManager(scriptManager);
// Attempt to call the function.
return switch (action.luaCallType) {
default -> false;
@@ -33,7 +36,7 @@ public final class ActionServerLuaCall extends AbilityActionHandler {
// Set the script library's group.
scriptLib.setCurrentGroup(group);
yield ActionServerLuaCall.callFunction(script, functionName);
yield ActionServerLuaCall.callFunction(script, functionName, ability, action);
}
case SpecificGroup -> {
var groupId = action.callParamList[0];
@@ -43,7 +46,16 @@ public final class ActionServerLuaCall extends AbilityActionHandler {
// Set the script library's group.
scriptLib.setCurrentGroup(group);
yield ActionServerLuaCall.callFunction(script, functionName);
yield ActionServerLuaCall.callFunction(script, functionName, ability, action);
}
case Gadget -> {
var controller = target.getEntityController();
if (controller == null || functionName.isBlank()) yield false;
// Hand off the function handling to the controller.
controller.callControllerScriptFunc(target, functionName, ability, action);
yield true;
}
};
}
@@ -53,17 +65,32 @@ public final class ActionServerLuaCall extends AbilityActionHandler {
*
* @param bindings The bindings to fetch the function from.
* @param functionName The name of the function to call.
* @param ability The ability data.
* @param action The ability action data.
* @return Whether the function was called successfully.
*/
private static boolean callFunction(Bindings bindings, String functionName) {
private static boolean callFunction(
Bindings bindings, String functionName,
Ability ability, AbilityModifierAction action
) {
try {
// Resolve the function from the script.
var function = bindings.get(functionName);
if (!(function instanceof LuaFunction luaFunction))
throw new Exception("Function is not a LuaFunction.");
// Attempt to invoke the function.
luaFunction.call(ScriptLoader.getScriptLibLua());
// Convert parameters to Lua values.
var lParam1 = LuaValue.valueOf(action.param1.getInt(ability));
var lParam2 = LuaValue.valueOf(action.param2.getInt(ability));
var lParam3 = LuaValue.valueOf(action.param3.getInt(ability));
// Invoke the function with the parameters.
switch (action.paramNum) {
case 1 -> luaFunction.invoke(new LuaValue[] { lParam1 });
case 2 -> luaFunction.invoke(new LuaValue[] { lParam1, lParam2 });
case 3 -> luaFunction.invoke(new LuaValue[] { lParam1, lParam2, lParam3 });
default -> luaFunction.invoke(new LuaValue[] { ScriptLoader.getScriptLibLua() });
}
return true;
} catch (Exception exception) {