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

Dropped ForceInventoryUpdate configuration.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-08-19 22:31:14 +00:00
parent 8ab5c31458
commit 58f30044d5
403 changed files with 3443 additions and 8712 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/Config.java
View File

@ -470,7 +470,6 @@ public class Config
public static boolean AUTODELETE_INVALID_QUEST_DATA;
public static boolean ENABLE_STORY_QUEST_BUFF_REWARD;
public static boolean MULTIPLE_ITEM_DROP;
public static boolean FORCE_INVENTORY_UPDATE;
public static boolean LAZY_CACHE;
public static boolean CHECK_HTML_ENCODING;
public static boolean CACHE_CHAR_NAMES;
@ -2083,7 +2082,6 @@ public class Config
AUTODELETE_INVALID_QUEST_DATA = generalConfig.getBoolean("AutoDeleteInvalidQuestData", false);
ENABLE_STORY_QUEST_BUFF_REWARD = generalConfig.getBoolean("StoryQuestRewardBuff", true);
MULTIPLE_ITEM_DROP = generalConfig.getBoolean("MultipleItemDrop", true);
FORCE_INVENTORY_UPDATE = generalConfig.getBoolean("ForceInventoryUpdate", false);
LAZY_CACHE = generalConfig.getBoolean("LazyCache", true);
CHECK_HTML_ENCODING = generalConfig.getBoolean("CheckHtmlEncoding", true);
CACHE_CHAR_NAMES = generalConfig.getBoolean("CacheCharNames", true);

15
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/CombatFlag.java
View File

@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.model;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.instance.Item;
@ -82,16 +81,10 @@ public class CombatFlag
_player.sendPacket(sm);
// Refresh inventory
if (!Config.FORCE_INVENTORY_UPDATE)
{
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_item);
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_item);
_player.sendInventoryUpdate(iu);
// Refresh player stats
_player.broadcastUserInfo();
_player.setCombatFlagEquipped(true);

24
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/TradeList.java
View File

@ -591,31 +591,17 @@ public class TradeList
else
{
// Prepare inventory update packet
final InventoryUpdate ownerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
final InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
final InventoryUpdate ownerIU = new InventoryUpdate();
final InventoryUpdate partnerIU = new InventoryUpdate();
// Transfer items
partnerList.TransferItems(_owner, partnerIU, ownerIU);
TransferItems(partnerList.getOwner(), ownerIU, partnerIU);
// Send inventory update packet
if (ownerIU != null)
{
_owner.sendInventoryUpdate(ownerIU);
}
else
{
_owner.sendItemList();
}
// Send inventory update packets
_owner.sendInventoryUpdate(ownerIU);
_partner.sendInventoryUpdate(partnerIU);
if (partnerIU != null)
{
_partner.sendInventoryUpdate(partnerIU);
}
else
{
_partner.sendItemList();
}
success = true;
}

164
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -3119,22 +3119,15 @@ public class Player extends Playable
_inventory.addAdena(process, count, this, reference);
// Send update packet
if (!Config.FORCE_INVENTORY_UPDATE)
if (count == getAdena())
{
if (count == getAdena())
{
sendItemList();
}
else
{
final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(_inventory.getAdenaInstance());
sendInventoryUpdate(iu);
}
sendItemList();
}
else
{
sendItemList();
final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(_inventory.getAdenaInstance());
sendInventoryUpdate(iu);
}
}
}
@ -3167,16 +3160,9 @@ public class Player extends Playable
}
// Send update packet
if (!Config.FORCE_INVENTORY_UPDATE)
{
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(adenaItem);
sendInventoryUpdate(iu);
}
else
{
sendItemList();
}
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(adenaItem);
sendInventoryUpdate(iu);
if (sendMessage)
{
@ -3217,16 +3203,9 @@ public class Player extends Playable
}
// Send update packet
if (!Config.FORCE_INVENTORY_UPDATE)
{
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(beautyTickets);
sendInventoryUpdate(iu);
}
else
{
sendItemList();
}
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(beautyTickets);
sendInventoryUpdate(iu);
if (sendMessage)
{
@ -3269,16 +3248,10 @@ public class Player extends Playable
if (count > 0)
{
_inventory.addAncientAdena(process, count, this, reference);
if (!Config.FORCE_INVENTORY_UPDATE)
{
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_inventory.getAncientAdenaInstance());
sendInventoryUpdate(iu);
}
else
{
sendItemList();
}
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_inventory.getAncientAdenaInstance());
sendInventoryUpdate(iu);
}
}
@ -3309,16 +3282,9 @@ public class Player extends Playable
return false;
}
if (!Config.FORCE_INVENTORY_UPDATE)
{
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(ancientAdenaItem);
sendInventoryUpdate(iu);
}
else
{
sendItemList();
}
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(ancientAdenaItem);
sendInventoryUpdate(iu);
if (sendMessage)
{
@ -3553,23 +3519,16 @@ public class Player extends Playable
}
// Send inventory update packet
if (!Config.FORCE_INVENTORY_UPDATE)
final InventoryUpdate playerIU = new InventoryUpdate();
if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0))
{
final InventoryUpdate playerIU = new InventoryUpdate();
if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0))
{
playerIU.addModifiedItem(destoyedItem);
}
else
{
playerIU.addRemovedItem(destoyedItem);
}
sendInventoryUpdate(playerIU);
playerIU.addModifiedItem(destoyedItem);
}
else
{
sendItemList();
playerIU.addRemovedItem(destoyedItem);
}
sendInventoryUpdate(playerIU);
// Sends message to client if requested
if (sendMessage)
@ -3669,23 +3628,16 @@ public class Player extends Playable
}
// Send inventory update packet
if (!Config.FORCE_INVENTORY_UPDATE)
final InventoryUpdate playerIU = new InventoryUpdate();
if (item.isStackable() && (item.getCount() > 0))
{
final InventoryUpdate playerIU = new InventoryUpdate();
if (item.isStackable() && (item.getCount() > 0))
{
playerIU.addModifiedItem(item);
}
else
{
playerIU.addRemovedItem(item);
}
sendInventoryUpdate(playerIU);
playerIU.addModifiedItem(item);
}
else
{
sendItemList();
playerIU.addRemovedItem(item);
}
sendInventoryUpdate(playerIU);
// Sends message to client if requested
if (sendMessage)
@ -3731,45 +3683,31 @@ public class Player extends Playable
}
// Send inventory update packet
if (!Config.FORCE_INVENTORY_UPDATE)
final InventoryUpdate playerIU = new InventoryUpdate();
if ((oldItem.getCount() > 0) && (oldItem != newItem))
{
final InventoryUpdate playerIU = new InventoryUpdate();
if ((oldItem.getCount() > 0) && (oldItem != newItem))
{
playerIU.addModifiedItem(oldItem);
}
else
{
playerIU.addRemovedItem(oldItem);
}
sendInventoryUpdate(playerIU);
playerIU.addModifiedItem(oldItem);
}
else
{
sendItemList();
playerIU.addRemovedItem(oldItem);
}
sendInventoryUpdate(playerIU);
// Send target update packet
if (target instanceof PlayerInventory)
{
final Player targetPlayer = ((PlayerInventory) target).getOwner();
if (!Config.FORCE_INVENTORY_UPDATE)
final InventoryUpdate targetIU = new InventoryUpdate();
if (newItem.getCount() > count)
{
final InventoryUpdate playerIU = new InventoryUpdate();
if (newItem.getCount() > count)
{
playerIU.addModifiedItem(newItem);
}
else
{
playerIU.addNewItem(newItem);
}
targetPlayer.sendPacket(playerIU);
targetIU.addModifiedItem(newItem);
}
else
{
targetPlayer.sendItemList();
targetIU.addNewItem(newItem);
}
targetPlayer.sendPacket(targetIU);
}
// Einhasad coin UI update.
@ -3865,16 +3803,9 @@ public class Player extends Playable
}
// Send inventory update packet
if (!Config.FORCE_INVENTORY_UPDATE)
{
final InventoryUpdate playerIU = new InventoryUpdate();
playerIU.addItem(droppedItem);
sendInventoryUpdate(playerIU);
}
else
{
sendItemList();
}
final InventoryUpdate playerIU = new InventoryUpdate();
playerIU.addItem(droppedItem);
sendInventoryUpdate(playerIU);
// Sends message to client if requested
if (sendMessage)
@ -3945,16 +3876,9 @@ public class Player extends Playable
}
// Send inventory update packet
if (!Config.FORCE_INVENTORY_UPDATE)
{
final InventoryUpdate playerIU = new InventoryUpdate();
playerIU.addItem(invitem);
sendInventoryUpdate(playerIU);
}
else
{
sendItemList();
}
final InventoryUpdate playerIU = new InventoryUpdate();
playerIU.addItem(invitem);
sendInventoryUpdate(playerIU);
// Sends message to client if requested
if (sendMessage)

39
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
View File

@ -424,16 +424,9 @@ public class PlayerInventory extends Inventory
if (actor != null)
{
// Send inventory update packet
if (!Config.FORCE_INVENTORY_UPDATE)
{
final InventoryUpdate playerIU = new InventoryUpdate();
playerIU.addItem(addedItem);
actor.sendInventoryUpdate(playerIU);
}
else
{
actor.sendItemList();
}
final InventoryUpdate playerIU = new InventoryUpdate();
playerIU.addItem(addedItem);
actor.sendInventoryUpdate(playerIU);
// Notify to scripts
EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getTemplate());
@ -490,23 +483,16 @@ public class PlayerInventory extends Inventory
// Send inventory update packet
if (update)
{
if (!Config.FORCE_INVENTORY_UPDATE)
final InventoryUpdate playerIU = new InventoryUpdate();
if (item.isStackable() && (item.getCount() > count))
{
final InventoryUpdate playerIU = new InventoryUpdate();
if (item.isStackable() && (item.getCount() > count))
{
playerIU.addModifiedItem(item);
}
else
{
playerIU.addNewItem(item);
}
actor.sendInventoryUpdate(playerIU);
playerIU.addModifiedItem(item);
}
else
{
actor.sendItemList();
playerIU.addNewItem(item);
}
actor.sendInventoryUpdate(playerIU);
// Adena UI update.
if (item.getId() == Inventory.ADENA_ID)
@ -1191,14 +1177,7 @@ public class PlayerInventory extends Inventory
}
finally
{
if (Config.FORCE_INVENTORY_UPDATE)
{
_owner.sendItemList();
}
else
{
_owner.sendInventoryUpdate(iu);
}
_owner.sendInventoryUpdate(iu);
}
}

24
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java
View File

@ -161,7 +161,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
}
// Proceed to the transfer
final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
final InventoryUpdate playerIU = new InventoryUpdate();
for (Item item : attachments.getItems())
{
if (item == null)
@ -176,17 +176,15 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
return;
}
if (playerIU != null)
if (newItem.isStackable() && (newItem.getCount() > count))
{
if (newItem.isStackable() && (newItem.getCount() > count))
{
playerIU.addModifiedItem(newItem);
}
else
{
playerIU.addNewItem(newItem);
}
playerIU.addModifiedItem(newItem);
}
else
{
playerIU.addNewItem(newItem);
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_X_S2);
sm.addItemName(item.getId());
sm.addLong(count);
@ -196,10 +194,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
msg.removeAttachments();
// Send updated item list to the player
if (playerIU != null)
{
player.sendInventoryUpdate(playerIU);
}
player.sendInventoryUpdate(playerIU);
// Send full list to avoid duplicates.
player.sendItemList();

17
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
View File

@ -207,22 +207,15 @@ public class RequestDestroyItem implements IClientIncomingPacket
return;
}
if (!Config.FORCE_INVENTORY_UPDATE)
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
player.sendInventoryUpdate(iu);
iu.addRemovedItem(removedItem);
}
else
{
player.sendItemList();
iu.addModifiedItem(removedItem);
}
player.sendInventoryUpdate(iu);
}
}

26
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java
View File

@ -156,7 +156,7 @@ public class RequestPackageSend implements IClientIncomingPacket
}
// Proceed to the transfer
final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
final InventoryUpdate playerIU = new InventoryUpdate();
for (ItemHolder i : _items)
{
// Check validity of requested item
@ -175,16 +175,13 @@ public class RequestPackageSend implements IClientIncomingPacket
continue;
}
if (playerIU != null)
if ((oldItem.getCount() > 0) && (oldItem != newItem))
{
if ((oldItem.getCount() > 0) && (oldItem != newItem))
{
playerIU.addModifiedItem(oldItem);
}
else
{
playerIU.addRemovedItem(oldItem);
}
playerIU.addModifiedItem(oldItem);
}
else
{
playerIU.addRemovedItem(oldItem);
}
// Remove item objects from the world.
@ -195,13 +192,6 @@ public class RequestPackageSend implements IClientIncomingPacket
warehouse.deleteMe();
// Send updated item list to the player
if (playerIU != null)
{
player.sendInventoryUpdate(playerIU);
}
else
{
player.sendItemList();
}
player.sendInventoryUpdate(playerIU);
}
}

23
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
View File

@ -184,7 +184,7 @@ public class RequestPostAttachment implements IClientIncomingPacket
}
// Proceed to the transfer
final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
final InventoryUpdate playerIU = new InventoryUpdate();
for (Item item : attachments.getItems())
{
if (item == null)
@ -205,16 +205,13 @@ public class RequestPostAttachment implements IClientIncomingPacket
return;
}
if (playerIU != null)
if (newItem.isStackable() && (newItem.getCount() > count))
{
if (newItem.isStackable() && (newItem.getCount() > count))
{
playerIU.addModifiedItem(newItem);
}
else
{
playerIU.addNewItem(newItem);
}
playerIU.addModifiedItem(newItem);
}
else
{
playerIU.addNewItem(newItem);
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_X_S2);
@ -224,10 +221,8 @@ public class RequestPostAttachment implements IClientIncomingPacket
}
// Send updated item list to the player
if (playerIU != null)
{
player.sendInventoryUpdate(playerIU);
}
player.sendInventoryUpdate(playerIU);
// Send full list to avoid duplicates.
player.sendItemList();

27
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java
View File

@ -310,7 +310,7 @@ public class RequestSendPost implements IClientIncomingPacket
}
// Proceed to the transfer
final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
final InventoryUpdate playerIU = new InventoryUpdate();
for (AttachmentItem i : _items)
{
// Check validity of requested item
@ -328,28 +328,19 @@ public class RequestSendPost implements IClientIncomingPacket
continue;
}
newItem.setItemLocation(newItem.getItemLocation(), msg.getId());
if (playerIU != null)
if ((oldItem.getCount() > 0) && (oldItem != newItem))
{
if ((oldItem.getCount() > 0) && (oldItem != newItem))
{
playerIU.addModifiedItem(oldItem);
}
else
{
playerIU.addRemovedItem(oldItem);
}
playerIU.addModifiedItem(oldItem);
}
else
{
playerIU.addRemovedItem(oldItem);
}
}
// Send updated item list to the player
if (playerIU != null)
{
player.sendInventoryUpdate(playerIU);
}
else
{
player.sendItemList();
}
player.sendInventoryUpdate(playerIU);
return true;
}

26
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
View File

@ -168,7 +168,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
}
// Proceed to the transfer
final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
final InventoryUpdate playerIU = new InventoryUpdate();
for (ItemHolder itemHolder : _items)
{
// Check validity of requested item
@ -191,27 +191,17 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
continue;
}
if (playerIU != null)
if ((oldItem.getCount() > 0) && (oldItem != newItem))
{
if ((oldItem.getCount() > 0) && (oldItem != newItem))
{
playerIU.addModifiedItem(oldItem);
}
else
{
playerIU.addRemovedItem(oldItem);
}
playerIU.addModifiedItem(oldItem);
}
else
{
playerIU.addRemovedItem(oldItem);
}
}
// Send updated item list to the player
if (playerIU != null)
{
player.sendInventoryUpdate(playerIU);
}
else
{
player.sendItemList();
}
player.sendInventoryUpdate(playerIU);
}
}

2
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java
View File

@ -405,7 +405,7 @@ public class RequestEnchantItem implements IClientIncomingPacket
player.sendPacket(sm);
}
if (!Config.FORCE_INVENTORY_UPDATE && (crystals != null))
if (crystals != null)
{
iu.addItem(crystals);
}

2
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestMultiEnchantItemList.java
View File

@ -277,7 +277,7 @@ public class ExRequestMultiEnchantItemList implements IClientIncomingPacket
_failureReward.put(_failureReward.size() + 1, itemHolder);
}
if (!Config.FORCE_INVENTORY_UPDATE && (crystals != null))
if (crystals != null)
{
iu.addItem(crystals);
}