Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-01-09 03:42:57 +08:00
Code Issues Projects Releases Wiki Activity

Fix ignored open states from being set

Browse Source
This commit is contained in:
KingRainbow44 2023-05-31 22:44:42 -04:00
parent 7458d4369e
commit 8e9121c962
No known key found for this signature in database
GPG Key ID: FC2CB64B00D257BE
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/emu/grasscutter/game/player/PlayerProgressManager.java
View File

@ -1,8 +1,5 @@
package emu.grasscutter.game.player; package emu.grasscutter.game.player;
import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
import static emu.grasscutter.scripts.constants.EventType.EVENT_UNLOCK_TRANS_POINT;
import emu.grasscutter.data.GameData; import emu.grasscutter.data.GameData;
import emu.grasscutter.data.binout.ScenePointEntry; import emu.grasscutter.data.binout.ScenePointEntry;
import emu.grasscutter.data.excels.OpenStateData; import emu.grasscutter.data.excels.OpenStateData;
@ -12,9 +9,13 @@ import emu.grasscutter.game.quest.enums.*;
import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode; import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
import emu.grasscutter.scripts.data.ScriptArgs; import emu.grasscutter.scripts.data.ScriptArgs;
import emu.grasscutter.server.packet.send.*; import emu.grasscutter.server.packet.send.*;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
import static emu.grasscutter.scripts.constants.EventType.EVENT_UNLOCK_TRANS_POINT;
// @Entity // @Entity
public final class PlayerProgressManager extends BasePlayerDataManager { public final class PlayerProgressManager extends BasePlayerDataManager {
/****************************************************************************************************************** /******************************************************************************************************************
@ -205,7 +206,8 @@ public final class PlayerProgressManager extends BasePlayerDataManager {
// * it can not be in the blacklist. // * it can not be in the blacklist.
if (!state.isAllowClientOpen() if (!state.isAllowClientOpen()
&& this.areConditionsMet(state) && this.areConditionsMet(state)
&& !BLACKLIST_OPEN_STATES.contains(state.getId())) { && !BLACKLIST_OPEN_STATES.contains(state.getId())
&& !IGNORED_OPEN_STATES.contains(state.getId())) {
this.setOpenState(state.getId(), 1, sendNotify); this.setOpenState(state.getId(), 1, sendNotify);
} }
} }