diff --git a/src/main/java/emu/grasscutter/game/entity/EntityGadget.java b/src/main/java/emu/grasscutter/game/entity/EntityGadget.java index a04d6e67dc5..55d0fd3ffd8 100644 --- a/src/main/java/emu/grasscutter/game/entity/EntityGadget.java +++ b/src/main/java/emu/grasscutter/game/entity/EntityGadget.java @@ -158,7 +158,11 @@ public void updateState(int state) { .getScriptManager() .callEvent( new ScriptArgs( - this.getGroupId(), EventType.EVENT_GADGET_STATE_CHANGE, state, this.getConfigId()).setParam3(oldState)); + this.getGroupId(), + EventType.EVENT_GADGET_STATE_CHANGE, + state, + this.getConfigId()) + .setParam3(oldState)); } @Deprecated(forRemoval = true) // Dont use! diff --git a/src/main/java/emu/grasscutter/game/inventory/Inventory.java b/src/main/java/emu/grasscutter/game/inventory/Inventory.java index ecb12c35d5a..eabda9c82fc 100644 --- a/src/main/java/emu/grasscutter/game/inventory/Inventory.java +++ b/src/main/java/emu/grasscutter/game/inventory/Inventory.java @@ -17,10 +17,9 @@ import emu.grasscutter.utils.Utils; import it.unimi.dsi.fastutil.ints.*; import it.unimi.dsi.fastutil.longs.*; -import lombok.val; -import javax.annotation.Nullable; - import java.util.*; +import javax.annotation.Nullable; +import lombok.val; public class Inventory extends BasePlayerManager implements Iterable { private final Long2ObjectMap store; @@ -65,8 +64,7 @@ public GameItem getItemByGuid(long id) { return this.getItems().get(id); } - @Nullable - public InventoryTab getInventoryTabByItemId(int itemId) { + @Nullable public InventoryTab getInventoryTabByItemId(int itemId) { val itemData = GameData.getItemDataMap().get(itemId); if (itemData == null || itemData.getItemType() == null) { return null; @@ -74,8 +72,7 @@ public InventoryTab getInventoryTabByItemId(int itemId) { return getInventoryTab(itemData.getItemType()); } - @Nullable - public GameItem getItemById(int itemId) { + @Nullable public GameItem getItemById(int itemId) { val inventoryTab = this.getInventoryTabByItemId(itemId); return inventoryTab != null ? inventoryTab.getItemById(itemId) : null; } diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentCompleteAnyTalk.java b/src/main/java/emu/grasscutter/game/quest/content/ContentCompleteAnyTalk.java index 19a2a3f0d3c..6a2b4c23cc5 100644 --- a/src/main/java/emu/grasscutter/game/quest/content/ContentCompleteAnyTalk.java +++ b/src/main/java/emu/grasscutter/game/quest/content/ContentCompleteAnyTalk.java @@ -4,8 +4,8 @@ import emu.grasscutter.data.excels.quest.QuestData; import emu.grasscutter.game.quest.*; -import lombok.val; import java.util.Arrays; +import lombok.val; @QuestValueContent(QUEST_CONTENT_COMPLETE_ANY_TALK) public class ContentCompleteAnyTalk extends BaseContent { @@ -13,9 +13,8 @@ public class ContentCompleteAnyTalk extends BaseContent { @Override public boolean execute( GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) { - var conditionTalk = Arrays.stream(condition.getParamStr().split(",")) - .mapToInt(Integer::parseInt) - .toArray(); + var conditionTalk = + Arrays.stream(condition.getParamStr().split(",")).mapToInt(Integer::parseInt).toArray(); for (var talkId : conditionTalk) { val checkMainQuest = quest.getOwner().getQuestManager().getMainQuestByTalkId(talkId); diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentLuaNotify.java b/src/main/java/emu/grasscutter/game/quest/content/ContentLuaNotify.java index bb3f1b14c61..3864a6d069e 100644 --- a/src/main/java/emu/grasscutter/game/quest/content/ContentLuaNotify.java +++ b/src/main/java/emu/grasscutter/game/quest/content/ContentLuaNotify.java @@ -16,6 +16,7 @@ public boolean execute( if (targetAmount == 0) { targetAmount = 1; } - return targetAmount <= quest.getOwner().getPlayerProgress().getCurrentProgress(condition.getParamStr()); + return targetAmount + <= quest.getOwner().getPlayerProgress().getCurrentProgress(condition.getParamStr()); } }