Preston/prestonbane
1
0
Fork 0
forked from MagicBane/Server
Code Issues Pull Requests Projects Releases Wiki Activity

Refactor of item.name; simplification.

Browse Source
This commit is contained in:
MagicBot
2024-03-16 08:56:22 -04:00
parent c54b0470fa
commit 3fdafe176b
6 changed files with 47 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/msg/ItemProductionMsg.java
+2 -2
View File
@@ -278,11 +278,11 @@ public class ItemProductionMsg extends ClientNetMsg {
writer.putInt(0);
}
writer.putString(toRoll.getCustomName());
;
writer.putString(toRoll.name);
writer.putInt(GameObjectType.MobLoot.ordinal());
writer.putInt(this.itemUUID);
writer.putInt(0); //items left to produce?
if (toRoll != null) {
writer.putInt(toRoll.getTemplateID());
writer.putInt(toRoll.getValue());
src/engine/net/client/msg/ManageNPCMsg.java
+24 -25
View File
@@ -441,32 +441,32 @@ public class ManageNPCMsg extends ClientNetMsg {
writer.putInt(itemList.size());
for (Item i : itemList) {
for (Item item : itemList) {
ItemBase ib = i.getItemBase();
ItemBase ib = item.getItemBase();
ItemTemplate template = ItemTemplate.templates.get(ib);
writer.put((byte) 0); // ? Unknown45
writer.putInt(i.getObjectType().ordinal());
writer.putInt(i.getObjectUUID());
writer.putInt(item.getObjectType().ordinal());
writer.putInt(item.getObjectUUID());
writer.putInt(0);
writer.putInt(i.getTemplateID());
writer.putInt(0);
writer.putInt(item.getTemplateID());
writer.putInt(template.item_value);
long timeLife = i.getDateToUpgrade() - System.currentTimeMillis();
long timeLife = item.getDateToUpgrade() - System.currentTimeMillis();
timeLife /= 1000;
timeLife /= 1000;
writer.putInt((int) timeLife);
writer.putInt(npc.getRollingTimeInSeconds(i.getTemplateID()));
writer.putInt(npc.getRollingTimeInSeconds(item.getTemplateID()));
writer.putInt(1);
if (i.isComplete())
writer.put((byte) 1);
else
writer.put((byte) 0);
if (item.isComplete())
writer.put((byte) 1);
else
writer.put((byte) 0);
ArrayList<String> effectsList = i.getEffectNames();
EffectsBase prefix = null;
ArrayList<String> effectsList = item.getEffectNames();
EffectsBase prefix = null;
EffectsBase suffix = null;
for (String effectName : effectsList) {
@@ -483,20 +483,19 @@ public class ManageNPCMsg extends ClientNetMsg {
else
writer.putInt(-1497023830);
if ((prefix != null && !i.isRandom()) || (prefix != null && i.isComplete()))
writer.putInt(prefix.getToken());
else
writer.putInt(0);
if ((prefix != null && !item.isRandom()) || (prefix != null && item.isComplete()))
writer.putInt(prefix.getToken());
else
writer.putInt(0);
if ((suffix != null && !i.isRandom()) || (suffix != null && i.isComplete()))
writer.putInt(suffix.getToken());
else
writer.putInt(0);
if ((suffix != null && !item.isRandom()) || (suffix != null && item.isComplete()))
writer.putInt(suffix.getToken());
else
writer.putInt(0);
writer.putString(i.getCustomName());
writer.putString(item.name);
}
writer.putInt(0);
writer.putInt(0);
writer.putInt(1);