Mirror/LunarCore
1
0
Fork 0
mirror of https://github.com/Melledy/LunarCore.git synced 2025-12-15 06:45:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix materials not being incremented properly

Browse Source
This commit is contained in:
Melledy
2023-10-05 06:37:16 -07:00
parent 528b1e3dbb
commit 4c976df0a1
1 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/main/java/emu/lunarcore/game/inventory/Inventory.java
View File

@@ -103,7 +103,7 @@ public class Inventory extends BasePlayerManager {
if (result != null) { if (result != null) {
// Send packet (update) // Send packet (update)
getPlayer().sendPacket(new PacketPlayerSyncScNotify(item)); getPlayer().sendPacket(new PacketPlayerSyncScNotify(result));
return true; return true;
} }
@@ -160,30 +160,27 @@ public class Inventory extends BasePlayerManager {
} }
return null; return null;
case Material: case Material:
switch (item.getExcel().getItemSubType()) { if (tab == null) {
default: return null;
if (tab == null) { }
GameItem existingItem = tab.getItemById(item.getItemId());
if (existingItem == null) {
// Item type didnt exist before, we will add it to main inventory map if there is enough space
if (tab.getSize() >= tab.getMaxCapacity()) {
return null; return null;
} }
GameItem existingItem = tab.getItemById(item.getItemId()); // Put item to inventory
if (existingItem == null) { this.putItem(item, tab);
// Item type didnt exist before, we will add it to main inventory map if there is enough space // Set ownership and save to db
if (tab.getSize() >= tab.getMaxCapacity()) { item.save();
return null; return item;
} } else {
// Make sure item count doesnt exceed stack limit // Add count
item.setCount(Math.min(item.getCount(), item.getExcel().getPileLimit())); existingItem.setCount(Math.min(existingItem.getCount() + item.getCount(), item.getExcel().getPileLimit()));
// Put item to inventory existingItem.save();
this.putItem(item, tab); return existingItem;
// Set ownership and save to db
item.save();
return item;
} else {
// Add count
existingItem.setCount(Math.min(existingItem.getCount() + item.getCount(), item.getExcel().getPileLimit()));
existingItem.save();
return existingItem;
}
} }
default: default:
return null; return null;