Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-04-04 15:02:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

various small bug fixes (#2270)

Browse Source 
* various small bug fixes

* Upgrade warning to error

* A few more state changes to match the others in this pull
This commit is contained in:
Nazrin
2023-07-22 20:17:59 -07:00
committed by GitHub
parent fe169398ec
commit 47971dc931
10 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/emu/grasscutter/game/quest/content/ContentQuestStateEqual.java
View File

@@ -13,9 +13,11 @@ public class ContentQuestStateEqual extends BaseContent {
public boolean execute(
GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
GameQuest checkQuest = quest.getOwner().getQuestManager().getQuestById(condition.getParam()[0]);
if (checkQuest == null) {
return false;
}
return checkQuest.getState().getValue() == params[1];
return checkQuest.getState().getValue() == condition.getParam()[1];
}
}

8
src/main/java/emu/grasscutter/game/quest/content/ContentQuestStateNotEqual.java
View File

@@ -12,12 +12,12 @@ public class ContentQuestStateNotEqual extends BaseContent {
@Override
public boolean execute(
GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
GameQuest checkQuest = quest.getOwner().getQuestManager().getQuestById(params[0]);
GameQuest checkQuest = quest.getOwner().getQuestManager().getQuestById(condition.getParam()[0]);
if (checkQuest != null) {
return checkQuest.getState().getValue() != params[1];
if (checkQuest == null) {
return false;
}
return false;
return checkQuest.getState().getValue() != condition.getParam()[1];
}
}

6
src/main/java/emu/grasscutter/game/quest/content/ContentQuestVarEqual.java
View File

@@ -13,8 +13,8 @@ public class ContentQuestVarEqual extends BaseContent {
@Override
public boolean execute(
GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
int questVarValue = quest.getMainQuest().getQuestVars()[params[0]];
Grasscutter.getLogger().debug("questVar {} : {}", params[0], questVarValue);
return questVarValue == params[1];
int questVarValue = quest.getMainQuest().getQuestVars()[condition.getParam()[0]];
Grasscutter.getLogger().debug("questVar {} : {}", condition.getParam()[0], questVarValue);
return questVarValue == condition.getParam()[1];
}
}

6
src/main/java/emu/grasscutter/game/quest/content/ContentQuestVarGreater.java
View File

@@ -13,8 +13,8 @@ public class ContentQuestVarGreater extends BaseContent {
@Override
public boolean execute(
GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
int questVarValue = quest.getMainQuest().getQuestVars()[params[0]];
Grasscutter.getLogger().debug("questVar {} : {}", params[0], questVarValue);
return questVarValue > params[1];
int questVarValue = quest.getMainQuest().getQuestVars()[condition.getParam()[0]];
Grasscutter.getLogger().debug("questVar {} : {}", condition.getParam()[0], questVarValue);
return questVarValue > condition.getParam()[1];
}
}

6
src/main/java/emu/grasscutter/game/quest/content/ContentQuestVarLess.java
View File

@@ -13,8 +13,8 @@ public class ContentQuestVarLess extends BaseContent {
@Override
public boolean execute(
GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
int questVarValue = quest.getMainQuest().getQuestVars()[params[0]];
Grasscutter.getLogger().debug("questVar {} : {}", params[0], questVarValue);
return questVarValue < params[1];
int questVarValue = quest.getMainQuest().getQuestVars()[condition.getParam()[0]];
Grasscutter.getLogger().debug("questVar {} : {}", condition.getParam()[0], questVarValue);
return questVarValue < condition.getParam()[1];
}
}