Optimize content handlers

KingRainbow44 · Aug 13, 2023 · 948dd5d · 948dd5d
1 parent 597574d
commit 948dd5d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 27 deletions.
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentBargainFail.java b/src/main/java/emu/grasscutter/game/quest/content/ContentBargainFail.java
@@ -9,12 +9,7 @@
 public final class ContentBargainFail extends BaseContent {
     @Override
     public boolean execute(GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
-        var bargain = quest.getOwner()
-                .getPlayerProgress()
-                .getBargains()
-                .get(condition.getParam()[0]);
-        if (bargain == null) return false;
-
-        return bargain.getResult() == BargainResultType.BARGAIN_COMPLETE_FAIL;
+        return condition.getParam()[0] == params[0] &&
+                condition.getParam()[1] == params[1];
     }
 }
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentBargainLessThan.java b/src/main/java/emu/grasscutter/game/quest/content/ContentBargainLessThan.java
@@ -9,12 +9,7 @@
 public final class ContentBargainLessThan extends BaseContent {
     @Override
     public boolean execute(GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
-        var bargain = quest.getOwner()
-                .getPlayerProgress()
-                .getBargains()
-                .get(condition.getParam()[0]);
-        if (bargain == null) return false;
-
-        return bargain.getResult() == BargainResultType.BARGAIN_SINGLE_FAIL;
+        return condition.getParam()[0] == params[0] &&
+                condition.getParam()[1] == params[1];
     }
 }
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentBargainSuccess.java b/src/main/java/emu/grasscutter/game/quest/content/ContentBargainSuccess.java
@@ -3,18 +3,12 @@
 import emu.grasscutter.data.excels.quest.QuestData;
 import emu.grasscutter.game.quest.*;
 import emu.grasscutter.game.quest.enums.QuestContent;
-import emu.grasscutter.net.proto.BargainResultTypeOuterClass.BargainResultType;
 
 @QuestValueContent(QuestContent.QUEST_CONTENT_BARGAIN_SUCC)
 public final class ContentBargainSuccess extends BaseContent {
     @Override
     public boolean execute(GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
-        var bargain = quest.getOwner()
-                .getPlayerProgress()
-                .getBargains()
-                .get(condition.getParam()[0]);
-        if (bargain == null) return false;
-
-        return bargain.getResult() == BargainResultType.BARGAIN_COMPLETE_SUCC;
+        return condition.getParam()[0] == params[0] &&
+                condition.getParam()[1] == params[1];
     }
 }
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentFinishGivingItem.java b/src/main/java/emu/grasscutter/game/quest/content/ContentFinishGivingItem.java
@@ -8,10 +8,7 @@
 public final class ContentFinishGivingItem extends BaseContent {
     @Override
     public boolean execute(GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
-        var giveAction = quest.getOwner()
-            .getPlayerProgress()
-            .getItemGivings()
-            .get(condition.getParam()[0]);
-        return giveAction != null && giveAction.isFinished();
+        return condition.getParam()[0] == params[0] &&
+                condition.getParam()[1] == params[1];
     }
 }