lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adena InventoryUpdate based on new adena count.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-06-25 13:56:16 +00:00
parent c2baac74a3
commit 68f229e93c
26 changed files with 247 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java
+8 -1
View File
@@ -3082,7 +3082,14 @@ public class Player extends Playable
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate(); final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_inventory.getAdenaInstance()); if (count == getAdena())
{
iu.addNewItem(_inventory.getAdenaInstance());
}
else
{
iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
else else
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java
+8 -1
View File
@@ -3084,7 +3084,14 @@ public class Player extends Playable
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate(); final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_inventory.getAdenaInstance()); if (count == getAdena())
{
iu.addNewItem(_inventory.getAdenaInstance());
}
else
{
iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
else else
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java
+8 -1
View File
@@ -3086,7 +3086,14 @@ public class Player extends Playable
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate(); final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_inventory.getAdenaInstance()); if (count == getAdena())
{
iu.addNewItem(_inventory.getAdenaInstance());
}
else
{
iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
else else
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java
+8 -1
View File
@@ -3082,7 +3082,14 @@ public class Player extends Playable
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate(); final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_inventory.getAdenaInstance()); if (count == getAdena())
{
iu.addNewItem(_inventory.getAdenaInstance());
}
else
{
iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
else else
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java
+8 -1
View File
@@ -3112,7 +3112,14 @@ public class Player extends Playable
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate(); final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_inventory.getAdenaInstance()); if (count == getAdena())
{
iu.addNewItem(_inventory.getAdenaInstance());
}
else
{
iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
else else
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java
+8 -1
View File
@@ -3125,7 +3125,14 @@ public class Player extends Playable
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate(); final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_inventory.getAdenaInstance()); if (count == getAdena())
{
iu.addNewItem(_inventory.getAdenaInstance());
}
else
{
iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
else else
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java
+8 -1
View File
@@ -3126,7 +3126,14 @@ public class Player extends Playable
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate(); final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_inventory.getAdenaInstance()); if (count == getAdena())
{
iu.addNewItem(_inventory.getAdenaInstance());
}
else
{
iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
else else
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java
+8 -1
View File
@@ -3063,7 +3063,14 @@ public class Player extends Playable
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate(); final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_inventory.getAdenaInstance()); if (count == getAdena())
{
iu.addNewItem(_inventory.getAdenaInstance());
}
else
{
iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
else else
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java
+8 -1
View File
@@ -3094,7 +3094,14 @@ public class Player extends Playable
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate(); final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_inventory.getAdenaInstance()); if (count == getAdena())
{
iu.addNewItem(_inventory.getAdenaInstance());
}
else
{
iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
else else
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java
+8 -1
View File
@@ -3111,7 +3111,14 @@ public class Player extends Playable
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate(); final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_inventory.getAdenaInstance()); if (count == getAdena())
{
iu.addNewItem(_inventory.getAdenaInstance());
}
else
{
iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
else else
L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
+8 -1
View File
@@ -3113,7 +3113,14 @@ public class Player extends Playable
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate(); final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_inventory.getAdenaInstance()); if (count == getAdena())
{
iu.addNewItem(_inventory.getAdenaInstance());
}
else
{
iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
else else
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
+8 -1
View File
@@ -3113,7 +3113,14 @@ public class Player extends Playable
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate(); final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_inventory.getAdenaInstance()); if (count == getAdena())
{
iu.addNewItem(_inventory.getAdenaInstance());
}
else
{
iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
else else
L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java
+11 -5
View File
@@ -2915,17 +2915,22 @@ public class Player extends Playable
sendPacket(sm); sendPacket(sm);
} }
if (count <= 0) if (count > 0)
{ {
return;
}
_inventory.addAdena(process, count, this, reference); _inventory.addAdena(process, count, this, reference);
// Send update packet // Send update packet
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate(); final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_inventory.getAdenaInstance()); if (count == getAdena())
{
iu.addNewItem(_inventory.getAdenaInstance());
}
else
{
iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendPacket(iu); sendPacket(iu);
} }
else else
@@ -2933,6 +2938,7 @@ public class Player extends Playable
sendPacket(new ItemList(this, false)); sendPacket(new ItemList(this, false));
} }
} }
}
/** /**
* Reduce adena in Inventory of the Player and send a Server->Client InventoryUpdate packet to the Player. * Reduce adena in Inventory of the Player and send a Server->Client InventoryUpdate packet to the Player.
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java
+11 -5
View File
@@ -3101,17 +3101,22 @@ public class Player extends Playable
sendPacket(sm); sendPacket(sm);
} }
if (count <= 0) if (count > 0)
{ {
return;
}
_inventory.addAdena(process, count, this, reference); _inventory.addAdena(process, count, this, reference);
// Send update packet // Send update packet
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate(); final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_inventory.getAdenaInstance()); if (count == getAdena())
{
iu.addNewItem(_inventory.getAdenaInstance());
}
else
{
iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendPacket(iu); sendPacket(iu);
} }
else else
@@ -3119,6 +3124,7 @@ public class Player extends Playable
sendPacket(new ItemList(this, false)); sendPacket(new ItemList(this, false));
} }
} }
}
/** /**
* Reduce adena in Inventory of the Player and send a Server->Client InventoryUpdate packet to the Player. * Reduce adena in Inventory of the Player and send a Server->Client InventoryUpdate packet to the Player.
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java
+11 -5
View File
@@ -3012,17 +3012,22 @@ public class Player extends Playable
sendPacket(sm); sendPacket(sm);
} }
if (count <= 0) if (count > 0)
{ {
return;
}
_inventory.addAdena(process, count, this, reference); _inventory.addAdena(process, count, this, reference);
// Send update packet // Send update packet
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate(); final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_inventory.getAdenaInstance()); if (count == getAdena())
{
iu.addNewItem(_inventory.getAdenaInstance());
}
else
{
iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendPacket(iu); sendPacket(iu);
} }
else else
@@ -3030,6 +3035,7 @@ public class Player extends Playable
sendPacket(new ItemList(this, false)); sendPacket(new ItemList(this, false));
} }
} }
}
/** /**
* Reduce adena in Inventory of the Player and send a Server->Client InventoryUpdate packet to the Player. * Reduce adena in Inventory of the Player and send a Server->Client InventoryUpdate packet to the Player.
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java
+8 -1
View File
@@ -3061,7 +3061,14 @@ public class Player extends Playable
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate(); final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_inventory.getAdenaInstance()); if (count == getAdena())
{
iu.addNewItem(_inventory.getAdenaInstance());
}
else
{
iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
else else
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java
+8 -1
View File
@@ -3061,7 +3061,14 @@ public class Player extends Playable
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate(); final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_inventory.getAdenaInstance()); if (count == getAdena())
{
iu.addNewItem(_inventory.getAdenaInstance());
}
else
{
iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
else else
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java
+8 -1
View File
@@ -3059,7 +3059,14 @@ public class Player extends Playable
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate(); final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_inventory.getAdenaInstance()); if (count == getAdena())
{
iu.addNewItem(_inventory.getAdenaInstance());
}
else
{
iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
else else
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java
+8 -1
View File
@@ -3086,7 +3086,14 @@ public class Player extends Playable
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate(); final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_inventory.getAdenaInstance()); if (count == getAdena())
{
iu.addNewItem(_inventory.getAdenaInstance());
}
else
{
iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
else else
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java
+8 -1
View File
@@ -3086,7 +3086,14 @@ public class Player extends Playable
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate(); final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_inventory.getAdenaInstance()); if (count == getAdena())
{
iu.addNewItem(_inventory.getAdenaInstance());
}
else
{
iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
else else
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java
+8 -1
View File
@@ -3013,7 +3013,14 @@ public class Player extends Playable
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate(); final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_inventory.getAdenaInstance()); if (count == getAdena())
{
iu.addNewItem(_inventory.getAdenaInstance());
}
else
{
iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
else else
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java
+8 -1
View File
@@ -3042,7 +3042,14 @@ public class Player extends Playable
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate(); final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_inventory.getAdenaInstance()); if (count == getAdena())
{
iu.addNewItem(_inventory.getAdenaInstance());
}
else
{
iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
else else
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java
+8 -1
View File
@@ -3074,7 +3074,14 @@ public class Player extends Playable
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate(); final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_inventory.getAdenaInstance()); if (count == getAdena())
{
iu.addNewItem(_inventory.getAdenaInstance());
}
else
{
iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
else else
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java
+8 -1
View File
@@ -3116,7 +3116,14 @@ public class Player extends Playable
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate(); final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_inventory.getAdenaInstance()); if (count == getAdena())
{
iu.addNewItem(_inventory.getAdenaInstance());
}
else
{
iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
else else
L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java
+8 -1
View File
@@ -3131,7 +3131,14 @@ public class Player extends Playable
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate(); final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_inventory.getAdenaInstance()); if (count == getAdena())
{
iu.addNewItem(_inventory.getAdenaInstance());
}
else
{
iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
else else
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java
+8 -1
View File
@@ -3136,7 +3136,14 @@ public class Player extends Playable
if (!Config.FORCE_INVENTORY_UPDATE) if (!Config.FORCE_INVENTORY_UPDATE)
{ {
final InventoryUpdate iu = new InventoryUpdate(); final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_inventory.getAdenaInstance()); if (count == getAdena())
{
iu.addNewItem(_inventory.getAdenaInstance());
}
else
{
iu.addModifiedItem(_inventory.getAdenaInstance());
}
sendInventoryUpdate(iu); sendInventoryUpdate(iu);
} }
else else