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

Run formatter & bump version

Browse Source
This commit is contained in:
KingRainbow44
2023-08-14 18:53:23 -04:00
parent 543749bc9f
commit 8cac8d13f4
9 changed files with 53 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/emu/grasscutter/game/ability/actions/ActionDebugLog.java
View File

@@ -10,9 +10,7 @@ import emu.grasscutter.game.entity.GameEntity;
public final class ActionDebugLog extends AbilityActionHandler {
@Override
public boolean execute(
Ability ability, AbilityModifierAction action,
ByteString abilityData, GameEntity target
) {
Ability ability, AbilityModifierAction action, ByteString abilityData, GameEntity target) {
Grasscutter.getLogger().debug("[Ability] DebugLog: {}", action.content);
return true;
}

10
src/main/java/emu/grasscutter/game/ability/actions/ActionServerLuaCall.java
View File

@@ -5,17 +5,14 @@ import emu.grasscutter.Grasscutter;
import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
import emu.grasscutter.game.ability.Ability;
import emu.grasscutter.game.entity.GameEntity;
import org.luaj.vm2.LuaFunction;
import javax.script.Bindings;
import org.luaj.vm2.LuaFunction;
@AbilityAction(AbilityModifierAction.Type.ServerLuaCall)
public final class ActionServerLuaCall extends AbilityActionHandler {
@Override
public boolean execute(
Ability ability, AbilityModifierAction action,
ByteString abilityData, GameEntity target
) {
Ability ability, AbilityModifierAction action, ByteString abilityData, GameEntity target) {
var scene = target.getScene();
var scriptManager = scene.getScriptManager();
var functionName = action.funcName;
@@ -58,8 +55,7 @@ public final class ActionServerLuaCall extends AbilityActionHandler {
return true;
} catch (Exception exception) {
Grasscutter.getLogger().warn("Unable to invoke {}.",
functionName, exception);
Grasscutter.getLogger().warn("Unable to invoke {}.", functionName, exception);
return false;
}
}

3
src/main/java/emu/grasscutter/game/world/Scene.java
View File

@@ -910,8 +910,7 @@ public final class Scene {
public int loadDynamicGroup(int group_id) {
SceneGroup group = getScriptManager().getGroupById(group_id);
if (group == null)
return -1; // Group not found
if (group == null) return -1; // Group not found
this.onLoadGroup(new ArrayList<>(List.of(group)));