Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-03-28 02:23:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Run spotlessApply

Browse Source
This commit is contained in:
KingRainbow44
2023-05-02 23:21:17 -04:00
parent b877ca9fce
commit d67e2d0c5e
1412 changed files with 1307455 additions and 1212598 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]);
}
}

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

@@ -6,7 +6,6 @@ import emu.grasscutter.data.GameData;
import emu.grasscutter.data.excels.quest.QuestData;
import emu.grasscutter.game.quest.GameQuest;
import emu.grasscutter.game.quest.QuestValueContent;
import lombok.val;
@QuestValueContent(QUEST_CONTENT_COMPLETE_TALK)
public class ContentCompleteTalk extends BaseContent {
@@ -14,7 +13,7 @@ public class ContentCompleteTalk extends BaseContent {
@Override
public boolean execute(
GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
return condition.getParam()[0] == params[0] &&
GameData.getTalkConfigDataMap().get(condition.getParam()[0]) != null;
return condition.getParam()[0] == params[0]
&& GameData.getTalkConfigDataMap().get(condition.getParam()[0]) != null;
}
}

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;
}
}