Mirror/LunarCore
1
0
Fork 0
mirror of https://github.com/Melledy/LunarCore.git synced 2026-02-04 06:55:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix locking/discarding items

Browse Source
This commit is contained in:
Melledy
2024-08-03 23:51:03 -07:00
parent 0b0568595a
commit 4cd7a512ae
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/emu/lunarcore/game/inventory/InventoryService.java
View File

@@ -532,12 +532,14 @@ public class InventoryService extends BaseGameService {
// Lock items // Lock items
for (int equipId : list) { for (int equipId : list) {
GameItem item = player.getInventory().getItemByUid(equipId); GameItem item = player.getInventory().getItemByUid(equipId);
if (item == null || !item.getExcel().isEquippable()) { if (item == null || !item.getExcel().isEquippable() || item.isDiscarded()) {
continue; continue;
} }
item.setLocked(locked); item.setLocked(locked);
item.save(); item.save();
items.add(item);
} }
// Send packet // Send packet
@@ -550,15 +552,17 @@ public class InventoryService extends BaseGameService {
// List of items to update on the client // List of items to update on the client
List<GameItem> items = new ArrayList<>(); List<GameItem> items = new ArrayList<>();
// Lock items // Discard items
for (int equipId : list) { for (int equipId : list) {
GameItem item = player.getInventory().getItemByUid(equipId); GameItem item = player.getInventory().getItemByUid(equipId);
if (item == null || !item.getExcel().isEquippable()) { if (item == null || !item.getExcel().isEquippable() || item.isLocked()) {
continue; continue;
} }
item.setDiscarded(discarded); item.setDiscarded(discarded);
item.save(); item.save();
items.add(item);
} }
// Send packet // Send packet