Send item list when adding new adena instance.

This commit is contained in:
MobiusDevelopment 2022-06-26 01:38:49 +00:00
parent 69127af274
commit 0500945790
28 changed files with 98 additions and 84 deletions

View File

@ -3081,17 +3081,17 @@ public class Player extends Playable
// Send update packet // Send update packet
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate();
if (count == getAdena()) if (count == getAdena())
{ {
iu.addNewItem(_inventory.getAdenaInstance()); sendItemList(false);
} }
else else
{ {
final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(_inventory.getAdenaInstance()); iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
}
else else
{ {
sendItemList(false); sendItemList(false);

View File

@ -3083,17 +3083,17 @@ public class Player extends Playable
// Send update packet // Send update packet
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate();
if (count == getAdena()) if (count == getAdena())
{ {
iu.addNewItem(_inventory.getAdenaInstance()); sendItemList(false);
} }
else else
{ {
final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(_inventory.getAdenaInstance()); iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
}
else else
{ {
sendItemList(false); sendItemList(false);

View File

@ -3085,17 +3085,17 @@ public class Player extends Playable
// Send update packet // Send update packet
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate();
if (count == getAdena()) if (count == getAdena())
{ {
iu.addNewItem(_inventory.getAdenaInstance()); sendItemList(false);
} }
else else
{ {
final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(_inventory.getAdenaInstance()); iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
}
else else
{ {
sendItemList(false); sendItemList(false);

View File

@ -3081,17 +3081,17 @@ public class Player extends Playable
// Send update packet // Send update packet
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate();
if (count == getAdena()) if (count == getAdena())
{ {
iu.addNewItem(_inventory.getAdenaInstance()); sendItemList(false);
} }
else else
{ {
final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(_inventory.getAdenaInstance()); iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
}
else else
{ {
sendItemList(false); sendItemList(false);

View File

@ -3111,17 +3111,17 @@ public class Player extends Playable
// Send update packet // Send update packet
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate();
if (count == getAdena()) if (count == getAdena())
{ {
iu.addNewItem(_inventory.getAdenaInstance()); sendItemList();
} }
else else
{ {
final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(_inventory.getAdenaInstance()); iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
}
else else
{ {
sendItemList(); sendItemList();

View File

@ -3124,17 +3124,17 @@ public class Player extends Playable
// Send update packet // Send update packet
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate();
if (count == getAdena()) if (count == getAdena())
{ {
iu.addNewItem(_inventory.getAdenaInstance()); sendItemList();
} }
else else
{ {
final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(_inventory.getAdenaInstance()); iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
}
else else
{ {
sendItemList(); sendItemList();

View File

@ -3125,17 +3125,17 @@ public class Player extends Playable
// Send update packet // Send update packet
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate();
if (count == getAdena()) if (count == getAdena())
{ {
iu.addNewItem(_inventory.getAdenaInstance()); sendItemList();
} }
else else
{ {
final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(_inventory.getAdenaInstance()); iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
}
else else
{ {
sendItemList(); sendItemList();

View File

@ -3062,17 +3062,17 @@ public class Player extends Playable
// Send update packet // Send update packet
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate();
if (count == getAdena()) if (count == getAdena())
{ {
iu.addNewItem(_inventory.getAdenaInstance()); sendItemList();
} }
else else
{ {
final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(_inventory.getAdenaInstance()); iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
}
else else
{ {
sendItemList(); sendItemList();

View File

@ -3093,17 +3093,17 @@ public class Player extends Playable
// Send update packet // Send update packet
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate();
if (count == getAdena()) if (count == getAdena())
{ {
iu.addNewItem(_inventory.getAdenaInstance()); sendItemList();
} }
else else
{ {
final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(_inventory.getAdenaInstance()); iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
}
else else
{ {
sendItemList(); sendItemList();

View File

@ -3110,17 +3110,17 @@ public class Player extends Playable
// Send update packet // Send update packet
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate();
if (count == getAdena()) if (count == getAdena())
{ {
iu.addNewItem(_inventory.getAdenaInstance()); sendItemList();
} }
else else
{ {
final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(_inventory.getAdenaInstance()); iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
}
else else
{ {
sendItemList(); sendItemList();

View File

@ -3112,17 +3112,17 @@ public class Player extends Playable
// Send update packet // Send update packet
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate();
if (count == getAdena()) if (count == getAdena())
{ {
iu.addNewItem(_inventory.getAdenaInstance()); sendItemList();
} }
else else
{ {
final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(_inventory.getAdenaInstance()); iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
}
else else
{ {
sendItemList(); sendItemList();

View File

@ -3112,17 +3112,17 @@ public class Player extends Playable
// Send update packet // Send update packet
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate();
if (count == getAdena()) if (count == getAdena())
{ {
iu.addNewItem(_inventory.getAdenaInstance()); sendItemList();
} }
else else
{ {
final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(_inventory.getAdenaInstance()); iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
}
else else
{ {
sendItemList(); sendItemList();

View File

@ -3222,11 +3222,18 @@ public class Player extends Playable
// Send update packet // Send update packet
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{
if (count == getAdena())
{
sendPacket(new ItemList(this, false));
}
else
{ {
final InventoryUpdate iu = new InventoryUpdate(); final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_inventory.getAdenaInstance()); iu.addModifiedItem(_inventory.getAdenaInstance());
sendPacket(iu); sendPacket(iu);
} }
}
else else
{ {
sendPacket(new ItemList(this, false)); sendPacket(new ItemList(this, false));

View File

@ -3290,11 +3290,18 @@ public class Player extends Playable
// Send update packet // Send update packet
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{
if (count == getAdena())
{
sendPacket(new ItemList(this, false));
}
else
{ {
final InventoryUpdate iu = new InventoryUpdate(); final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_inventory.getAdenaInstance()); iu.addModifiedItem(_inventory.getAdenaInstance());
sendPacket(iu); sendPacket(iu);
} }
}
else else
{ {
sendPacket(new ItemList(this, false)); sendPacket(new ItemList(this, false));

View File

@ -2922,17 +2922,17 @@ public class Player extends Playable
// Send update packet // Send update packet
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate();
if (count == getAdena()) if (count == getAdena())
{ {
iu.addNewItem(_inventory.getAdenaInstance()); sendPacket(new ItemList(this, false));
} }
else else
{ {
final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(_inventory.getAdenaInstance()); iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendPacket(iu); sendPacket(iu);
} }
}
else else
{ {
sendPacket(new ItemList(this, false)); sendPacket(new ItemList(this, false));

View File

@ -3108,17 +3108,17 @@ public class Player extends Playable
// Send update packet // Send update packet
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate();
if (count == getAdena()) if (count == getAdena())
{ {
iu.addNewItem(_inventory.getAdenaInstance()); sendPacket(new ItemList(this, false));
} }
else else
{ {
final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(_inventory.getAdenaInstance()); iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendPacket(iu); sendPacket(iu);
} }
}
else else
{ {
sendPacket(new ItemList(this, false)); sendPacket(new ItemList(this, false));

View File

@ -3019,17 +3019,17 @@ public class Player extends Playable
// Send update packet // Send update packet
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate();
if (count == getAdena()) if (count == getAdena())
{ {
iu.addNewItem(_inventory.getAdenaInstance()); sendPacket(new ItemList(this, false));
} }
else else
{ {
final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(_inventory.getAdenaInstance()); iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendPacket(iu); sendPacket(iu);
} }
}
else else
{ {
sendPacket(new ItemList(this, false)); sendPacket(new ItemList(this, false));

View File

@ -3060,17 +3060,17 @@ public class Player extends Playable
// Send update packet // Send update packet
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate();
if (count == getAdena()) if (count == getAdena())
{ {
iu.addNewItem(_inventory.getAdenaInstance()); sendItemList(false);
} }
else else
{ {
final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(_inventory.getAdenaInstance()); iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
}
else else
{ {
sendItemList(false); sendItemList(false);

View File

@ -3060,17 +3060,17 @@ public class Player extends Playable
// Send update packet // Send update packet
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate();
if (count == getAdena()) if (count == getAdena())
{ {
iu.addNewItem(_inventory.getAdenaInstance()); sendItemList(false);
} }
else else
{ {
final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(_inventory.getAdenaInstance()); iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
}
else else
{ {
sendItemList(false); sendItemList(false);

View File

@ -3058,17 +3058,17 @@ public class Player extends Playable
// Send update packet // Send update packet
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate();
if (count == getAdena()) if (count == getAdena())
{ {
iu.addNewItem(_inventory.getAdenaInstance()); sendItemList();
} }
else else
{ {
final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(_inventory.getAdenaInstance()); iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
}
else else
{ {
sendItemList(); sendItemList();

View File

@ -3085,17 +3085,17 @@ public class Player extends Playable
// Send update packet // Send update packet
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate();
if (count == getAdena()) if (count == getAdena())
{ {
iu.addNewItem(_inventory.getAdenaInstance()); sendItemList();
} }
else else
{ {
final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(_inventory.getAdenaInstance()); iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
}
else else
{ {
sendItemList(); sendItemList();

View File

@ -3085,17 +3085,17 @@ public class Player extends Playable
// Send update packet // Send update packet
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate();
if (count == getAdena()) if (count == getAdena())
{ {
iu.addNewItem(_inventory.getAdenaInstance()); sendItemList();
} }
else else
{ {
final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(_inventory.getAdenaInstance()); iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
}
else else
{ {
sendItemList(); sendItemList();

View File

@ -3012,17 +3012,17 @@ public class Player extends Playable
// Send update packet // Send update packet
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate();
if (count == getAdena()) if (count == getAdena())
{ {
iu.addNewItem(_inventory.getAdenaInstance()); sendItemList();
} }
else else
{ {
final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(_inventory.getAdenaInstance()); iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
}
else else
{ {
sendItemList(); sendItemList();

View File

@ -3041,17 +3041,17 @@ public class Player extends Playable
// Send update packet // Send update packet
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate();
if (count == getAdena()) if (count == getAdena())
{ {
iu.addNewItem(_inventory.getAdenaInstance()); sendItemList(false);
} }
else else
{ {
final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(_inventory.getAdenaInstance()); iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
}
else else
{ {
sendItemList(false); sendItemList(false);

View File

@ -3073,17 +3073,17 @@ public class Player extends Playable
// Send update packet // Send update packet
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate();
if (count == getAdena()) if (count == getAdena())
{ {
iu.addNewItem(_inventory.getAdenaInstance()); sendItemList();
} }
else else
{ {
final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(_inventory.getAdenaInstance()); iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
}
else else
{ {
sendItemList(); sendItemList();

View File

@ -3115,17 +3115,17 @@ public class Player extends Playable
// Send update packet // Send update packet
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate();
if (count == getAdena()) if (count == getAdena())
{ {
iu.addNewItem(_inventory.getAdenaInstance()); sendItemList();
} }
else else
{ {
final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(_inventory.getAdenaInstance()); iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
}
else else
{ {
sendItemList(); sendItemList();

View File

@ -3130,17 +3130,17 @@ public class Player extends Playable
// Send update packet // Send update packet
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate();
if (count == getAdena()) if (count == getAdena())
{ {
iu.addNewItem(_inventory.getAdenaInstance()); sendItemList();
} }
else else
{ {
final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(_inventory.getAdenaInstance()); iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
}
else else
{ {
sendItemList(); sendItemList();

View File

@ -3135,17 +3135,17 @@ public class Player extends Playable
// Send update packet // Send update packet
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate();
if (count == getAdena()) if (count == getAdena())
{ {
iu.addNewItem(_inventory.getAdenaInstance()); sendItemList();
} }
else else
{ {
final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(_inventory.getAdenaInstance()); iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
}
else else
{ {
sendItemList(); sendItemList();