Mirror/Nebula
1
0
Fork 0
mirror of https://github.com/Melledy/Nebula.git synced 2026-09-20 01:29:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rework and optimize inventory

Browse Source 
`GameItem`s and `GameResource`s are now deprecated, they are stored as regular `ItemParamMap`s in the `Inventory` class instead. This is to reduce database load when loading a player.
This commit is contained in:
Melledy
2026-04-15 03:01:31 -07:00
parent fa91ab0555
commit 9ba38d5a5e
7 changed files with 129 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/emu/nebula/game/player/Player.java
+15 -5
View File
@@ -43,8 +43,10 @@ import emu.nebula.proto.Public.CharShow;
import emu.nebula.proto.Public.Energy;
import emu.nebula.proto.Public.Friend;
import emu.nebula.proto.Public.HonorInfo;
import emu.nebula.proto.Public.Item;
import emu.nebula.proto.Public.NewbieInfo;
import emu.nebula.proto.Public.QuestType;
import emu.nebula.proto.Public.Res;
import emu.nebula.proto.Public.WorldClass;
import emu.nebula.proto.Public.WorldClassRewardState;
import emu.nebula.util.Utils;
@@ -789,7 +791,7 @@ public class Player implements GameDatabaseObject {
if (this.inventory == null) {
this.inventory = this.loadManagerFromDatabase(Inventory.class);
}
this.getInventory().loadFromDatabase();
this.getInventory().migrateFromDatabase();
// Load referenced classes from the database
this.formations = this.loadManagerFromDatabase(FormationManager.class);
@@ -952,12 +954,20 @@ public class Player implements GameDatabaseObject {
proto.addDiscs(disc.toProto());
}
for (var item : getInventory().getItems().values()) {
proto.addItems(item.toProto());
for (var item : getInventory().getItems().int2IntEntrySet()) {
var info = Item.newInstance()
.setTid(item.getIntKey())
.setQty(item.getIntValue());
proto.addItems(info);
}
for (var res : getInventory().getResources().values()) {
proto.addRes(res.toProto());
for (var res : getInventory().getResources().int2IntEntrySet()) {
var info = Res.newInstance()
.setTid(res.getIntKey())
.setQty(res.getIntValue());
proto.addRes(info);
}
// Formations