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

Run spotlessApply

Browse Source 
also set line endings to native, no more line conflict errors!
This commit is contained in:
KingRainbow44
2023-05-02 14:00:00 +01:00
Unverified
parent 4f1136ce2d
commit d32f6982be
1426 changed files with 1307543 additions and 1212705 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/emu/grasscutter/game/talk/exec/ExecTransSceneDummyPoint.java
+15 -9
View File
@@ -1,7 +1,6 @@
package emu.grasscutter.game.talk.exec;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.binout.ScriptSceneData;
import emu.grasscutter.data.excels.TalkConfigData;
import emu.grasscutter.data.excels.TalkConfigData.TalkExecParam;
import emu.grasscutter.game.player.Player;
@@ -17,23 +16,30 @@ public final class ExecTransSceneDummyPoint extends TalkExecHandler {
// param[0] == sceneid, param[1] == position
if (execParam.getParam().length < 2) return;
var fullGlobals = GameData.getScriptSceneDataMap().get("flat.luas.scenes.full_globals.lua.json");
var fullGlobals =
GameData.getScriptSceneDataMap().get("flat.luas.scenes.full_globals.lua.json");
if (fullGlobals == null) return;
var dummyPointScript = fullGlobals.getScriptObjectList()
.get(execParam.getParam()[0] + "/scene" + execParam.getParam()[0] + "_dummy_points.lua");
var dummyPointScript =
fullGlobals
.getScriptObjectList()
.get(
execParam.getParam()[0] + "/scene" + execParam.getParam()[0] + "_dummy_points.lua");
if (dummyPointScript == null) return;
var dummyPointMap = dummyPointScript.getDummyPoints();
if (dummyPointMap == null) return;
var transmitPosPos = dummyPointMap.get(execParam.getParam()[1] + ".pos");
// List<Float> transmitPosRot = dummyPointMap.get(e.getParam()[1] + ".rot"); would be useful when transportation consider rotation
// List<Float> transmitPosRot = dummyPointMap.get(e.getParam()[1] + ".rot"); would be useful
// when transportation consider rotation
if (transmitPosPos == null || transmitPosPos.isEmpty()) return;
player.getWorld().transferPlayerToScene(
player,
Integer.parseInt(execParam.getParam()[0]),
new Position(transmitPosPos.get(0), transmitPosPos.get(1), transmitPosPos.get(2)));
player
.getWorld()
.transferPlayerToScene(
player,
Integer.parseInt(execParam.getParam()[0]),
new Position(transmitPosPos.get(0), transmitPosPos.get(1), transmitPosPos.get(2)));
}
}