Anime-Game-Servers/AnimeGamesLua
1
0
Fork 0
mirror of https://github.com/Anime-Game-Servers/AnimeGamesLua.git synced 2024-11-23 04:19:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Fix] Fixed parameter switchup in KillEntityByConfigId (thx @scooterboo )

Browse Source
This commit is contained in:
hartie95 2024-02-11 21:23:11 +01:00
parent a91021a048
commit 34e9f21cab
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
GILua/src/main/java/org/anime_game_servers/gi_lua/models/scene/group/SceneGroup.java
View File

@ -139,12 +139,12 @@ public class SceneGroup {
this.suites = cs.getGlobalVariableList("suites", SceneSuite.class);
this.regions = cs.getGlobalVariableList("regions", SceneRegion.class).stream()
.peek(group -> {
group.groupId = groupId;
group.blockId = blockId;
group.sceneMeta = sceneMeta;
})
.collect(Collectors.toMap(x -> x.configId, y -> y, (a, b) -> a));
this.regions.values().forEach(m -> {
m.groupId = groupId;
m.blockId = blockId;
m.sceneMeta = sceneMeta;
});
this.initConfig = cs.getGlobalVariable("init_config", SceneInitConfig.class);

2
GILua/src/main/java/org/anime_game_servers/gi_lua/script_lib/ScriptLib.java
View File

@ -266,7 +266,7 @@ public class ScriptLib {
return INVALID_PARAMETER.getValue();
}
val entityType = EntityType.values()[entityTypeValue];
val params = new KillByConfigIdParams(groupId, configId, entityType);
val params = new KillByConfigIdParams(configId, groupId, entityType);
if (context instanceof GroupEventLuaContext gContext){
return gContext.getScriptLibHandlerProvider().getScriptLibHandler().KillEntityByConfigId(gContext, params);
} else if (context instanceof ControllerLuaContext cContext) {