From 6d845e1cc634e50cdcc76d30ac50f9bbaa367cff Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 20 May 2023 15:45:17 +0000
Subject: [PATCH] Format code [skip actions]

---
 src/main/java/emu/grasscutter/game/player/PlayerProgress.java | 2 +-
 .../emu/grasscutter/game/quest/content/ContentFinishPlot.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/emu/grasscutter/game/player/PlayerProgress.java b/src/main/java/emu/grasscutter/game/player/PlayerProgress.java
index c8bca3c1f..d53cb7342 100644
--- a/src/main/java/emu/grasscutter/game/player/PlayerProgress.java
+++ b/src/main/java/emu/grasscutter/game/player/PlayerProgress.java
@@ -79,7 +79,7 @@ public class PlayerProgress {
     }
 
     public int resetCurrentProgress(int progressId) {
-        return questProgressCountMap.merge(progressId,0,Integer::min);
+        return questProgressCountMap.merge(progressId, 0, Integer::min);
     }
 
     @Entity
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentFinishPlot.java b/src/main/java/emu/grasscutter/game/quest/content/ContentFinishPlot.java
index 1e2a4c031..32842cdbd 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentFinishPlot.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentFinishPlot.java
@@ -16,7 +16,7 @@ public class ContentFinishPlot extends BaseContent {
         MainQuestData.TalkData talkData =
                 quest.getMainQuest().getTalks().get(Integer.valueOf(params[0]));
         GameQuest subQuest = quest.getMainQuest().getChildQuestById(params[0]);
-        return (talkData != null && subQuest != null
-                || condition.getParamStr().equals(paramStr)) && condition.getParam()[0] == params[0];
+        return (talkData != null && subQuest != null || condition.getParamStr().equals(paramStr))
+                && condition.getParam()[0] == params[0];
     }
 }