Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-03-30 20:42:27 +02:00
Code Issues Packages 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
parent 4f1136ce2d
commit d32f6982be
1426 changed files with 1307544 additions and 1212706 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/emu/grasscutter/game/quest/content/ContentCompleteAnyTalk.java
View File

@@ -15,8 +15,9 @@ public class ContentCompleteAnyTalk extends BaseContent {
public boolean execute(
GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
return Stream.of(condition.getParamStr().split(","))
.mapToInt(Integer::parseInt)
.anyMatch(talkId -> GameData.getTalkConfigDataMap()
.get(params[0]) != null && talkId == params[0]);
.mapToInt(Integer::parseInt)
.anyMatch(
talkId ->
GameData.getTalkConfigDataMap().get(params[0]) != null && talkId == params[0]);
}
}

1
src/main/java/emu/grasscutter/game/quest/content/ContentCompleteTalk.java
View File

@@ -2,7 +2,6 @@ package emu.grasscutter.game.quest.content;
import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_COMPLETE_TALK;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.excels.quest.QuestData;
import emu.grasscutter.game.quest.GameQuest;
import emu.grasscutter.game.quest.QuestValueContent;

3
src/main/java/emu/grasscutter/game/quest/content/ContentFinishDungeon.java
View File

@@ -14,7 +14,6 @@ public class ContentFinishDungeon extends BaseContent {
public boolean execute(
GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
var dungeonId = condition.getParam()[0];
return quest.getOwner().getPlayerProgress()
.getCompletedDungeons().contains(dungeonId);
return quest.getOwner().getPlayerProgress().getCompletedDungeons().contains(dungeonId);
}
}

3
src/main/java/emu/grasscutter/game/quest/content/ContentTriggerFire.java
View File

@@ -17,8 +17,7 @@ public class ContentTriggerFire extends BaseContent {
return quest.getTriggers().get(quest.getTriggerNameById(params[0]));
} else {
Grasscutter.getLogger()
.debug("Quest {} doesn't have trigger {} registered.",
quest.getSubQuestId(), params[0]);
.debug("Quest {} doesn't have trigger {} registered.", quest.getSubQuestId(), params[0]);
return false;
}
}