Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-01-10 04:32:53 +08:00
Code Issues Projects Releases Wiki Activity

Medicine revival&Login white screen (#1883)

Browse Source 
* Update InventorySystem.java

-:[fix] Medicine revival

* Update GameMainQuest.java

-:[fix] Login white screen
This commit is contained in:
jacky14 2022-10-22 14:21:33 +08:00 committed by GitHub
parent c51f7610b2
commit ccf182d692
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/emu/grasscutter/game/quest/GameMainQuest.java
View File

@ -167,7 +167,7 @@ public class GameMainQuest {
boolean didRewind = false; boolean didRewind = false;
for (GameQuest quest : sortedByOrder) { for (GameQuest quest : sortedByOrder) {
int i = sortedByOrder.indexOf(quest); int i = sortedByOrder.indexOf(quest);
if ( i == sortedByOrder.size()) { if ( (i+1) >= sortedByOrder.size()) {
didRewind = quest.rewind(null); didRewind = quest.rewind(null);
} else { } else {
didRewind = quest.rewind(sortedByOrder.get(i+1)); didRewind = quest.rewind(sortedByOrder.get(i+1));

2
src/main/java/emu/grasscutter/game/systems/InventorySystem.java
View File

@ -778,7 +778,7 @@ public class InventorySystem extends BaseGameSystem {
} }
int[] satiationParams = itemData.getSatiationParams(); int[] satiationParams = itemData.getSatiationParams();
if (satiationParams != null && target.isPresent()) { if (satiationParams != null && satiationParams.length > 0 && target.isPresent()) {
// Invoke and call player use food event. // Invoke and call player use food event.
var event = new PlayerUseFoodEvent(params.player, itemData, params.targetAvatar.getAsEntity()); event.call(); var event = new PlayerUseFoodEvent(params.player, itemData, params.targetAvatar.getAsEntity()); event.call();
if (event.isCanceled()) return false; if (event.isCanceled()) return false;