From e195d86fb662066c331970ae8a9d3a33825c08af Mon Sep 17 00:00:00 2001 From: MagicBot Date: Sun, 14 Apr 2024 15:49:08 -0400 Subject: [PATCH] Serialization update --- .../net/client/msg/ItemProductionMsg.java | 23 ++++--------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/src/engine/net/client/msg/ItemProductionMsg.java b/src/engine/net/client/msg/ItemProductionMsg.java index 98ea5320..78371605 100644 --- a/src/engine/net/client/msg/ItemProductionMsg.java +++ b/src/engine/net/client/msg/ItemProductionMsg.java @@ -11,15 +11,12 @@ package engine.net.client.msg; import engine.gameManager.BuildingManager; import engine.gameManager.ForgeManager; -import engine.gameManager.PowersManager; import engine.mbEnums; import engine.mbEnums.GameObjectType; import engine.net.*; import engine.objects.Building; import engine.objects.Item; -import engine.objects.MobLoot; import engine.objects.NPC; -import engine.powers.EffectsBase; import java.util.HashMap; @@ -237,25 +234,13 @@ public class ItemProductionMsg extends ClientNetMsg { writer.putInt(0); writer.putInt(0); writer.putInt(1); - MobLoot toRoll = MobLoot.getFromCache(this.itemUUID); + Item toRoll = ForgeManager.inMemoryItemLookup.get(this.itemUUID); writer.putInt(-1497023830); - if (toRoll != null && toRoll.getPrefix() != null && !toRoll.getPrefix().isEmpty()) { - EffectsBase eb = PowersManager.getEffectByIDString(toRoll.getPrefix()); - if (eb == null) - this.pToken = 0; - else - this.pToken = eb.getToken(); - } + this.pToken = toRoll.prefixToken; + this.sToken = toRoll.suffixToken; - if (toRoll != null && toRoll.getSuffix() != null && !toRoll.getSuffix().isEmpty()) { - EffectsBase eb = PowersManager.getEffectByIDString(toRoll.getSuffix()); - if (eb == null) - this.sToken = 0; - else - this.sToken = eb.getToken(); - } - if (toRoll.isRandom() == false || (toRoll != null && toRoll.isComplete())) { + if (toRoll.isComplete()) { writer.putInt(this.pToken); writer.putInt(this.sToken); } else {