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

6
L2J_Mobius_CT_0_Interlude/dist/game/config/General.ini vendored
View File

@@ -227,12 +227,6 @@ AutoDeleteInvalidQuestData = False
# Default: True
MultipleItemDrop = True
# Forces full item inventory packet to be sent for any item change.
# Notes:
# This can increase network traffic
# Default: False
ForceInventoryUpdate = False
# True = Load html's into cache only on first time html is requested.
# False = Load all html's into cache on server startup.
# Default: False

2
L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/Config.java
View File

@@ -525,7 +525,6 @@ public class Config
public static boolean CLEAR_DROPPED_ITEM_TABLE;
public static boolean AUTODELETE_INVALID_QUEST_DATA;
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;
@@ -1981,7 +1980,6 @@ public class Config
CLEAR_DROPPED_ITEM_TABLE = generalConfig.getBoolean("ClearDroppedItemTable", false);
AUTODELETE_INVALID_QUEST_DATA = generalConfig.getBoolean("AutoDeleteInvalidQuestData", false);
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);

9
L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java
View File

@@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.ItemList;
import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.util.Util;
@@ -585,14 +584,14 @@ 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);
_owner.sendPacket(ownerIU != null ? ownerIU : new ItemList(_owner, false));
_partner.sendPacket(partnerIU != null ? partnerIU : new ItemList(_partner, false));
_owner.sendPacket(ownerIU);
_partner.sendPacket(partnerIU);
// Update current load as well
StatusUpdate playerSU = new StatusUpdate(_owner);

169
L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@@ -2921,22 +2921,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())
{
sendPacket(new ItemList(this, false));
}
else
{
final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(_inventory.getAdenaInstance());
sendPacket(iu);
}
sendPacket(new ItemList(this, false));
}
else
{
sendPacket(new ItemList(this, false));
final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(_inventory.getAdenaInstance());
sendPacket(iu);
}
}
}
@@ -2969,16 +2962,9 @@ public class Player extends Playable
}
// Send update packet
if (!Config.FORCE_INVENTORY_UPDATE)
{
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(adenaItem);
sendPacket(iu);
}
else
{
sendPacket(new ItemList(this, false));
}
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(adenaItem);
sendPacket(iu);
if (sendMessage)
{
@@ -3014,16 +3000,10 @@ public class Player extends Playable
}
_inventory.addAncientAdena(process, count, this, reference);
if (!Config.FORCE_INVENTORY_UPDATE)
{
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_inventory.getAncientAdenaInstance());
sendPacket(iu);
}
else
{
sendPacket(new ItemList(this, false));
}
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_inventory.getAncientAdenaInstance());
sendPacket(iu);
}
/**
@@ -3053,16 +3033,9 @@ public class Player extends Playable
return false;
}
if (!Config.FORCE_INVENTORY_UPDATE)
{
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(ancientAdenaItem);
sendPacket(iu);
}
else
{
sendPacket(new ItemList(this, false));
}
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(ancientAdenaItem);
sendPacket(iu);
if (sendMessage)
{
@@ -3124,16 +3097,9 @@ public class Player extends Playable
final Item newitem = _inventory.addItem(process, item, this, reference);
// Send inventory update packet
if (!Config.FORCE_INVENTORY_UPDATE)
{
final InventoryUpdate playerIU = new InventoryUpdate();
playerIU.addItem(newitem);
sendPacket(playerIU);
}
else
{
sendPacket(new ItemList(this, false));
}
final InventoryUpdate playerIU = new InventoryUpdate();
playerIU.addItem(newitem);
sendPacket(playerIU);
// Update current load as well
final StatusUpdate su = new StatusUpdate(this);
@@ -3284,16 +3250,9 @@ public class Player extends Playable
}
// Send inventory update packet
if (!Config.FORCE_INVENTORY_UPDATE)
{
final InventoryUpdate playerIU = new InventoryUpdate();
playerIU.addItem(destoyedItem);
sendPacket(playerIU);
}
else
{
sendPacket(new ItemList(this, false));
}
final InventoryUpdate playerIU = new InventoryUpdate();
playerIU.addItem(destoyedItem);
sendPacket(playerIU);
// Update current load as well
final StatusUpdate su = new StatusUpdate(this);
@@ -3397,16 +3356,9 @@ public class Player extends Playable
}
// Send inventory update packet
if (!Config.FORCE_INVENTORY_UPDATE)
{
final InventoryUpdate playerIU = new InventoryUpdate();
playerIU.addItem(item);
sendPacket(playerIU);
}
else
{
sendPacket(new ItemList(this, false));
}
final InventoryUpdate playerIU = new InventoryUpdate();
playerIU.addItem(item);
sendPacket(playerIU);
// Update current load as well
final StatusUpdate su = new StatusUpdate(this);
@@ -3457,23 +3409,16 @@ 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);
}
sendPacket(playerIU);
playerIU.addModifiedItem(oldItem);
}
else
{
sendPacket(new ItemList(this, false));
playerIU.addRemovedItem(oldItem);
}
sendPacket(playerIU);
// Update current load as well
StatusUpdate playerSU = new StatusUpdate(this);
@@ -3484,23 +3429,16 @@ public class Player extends Playable
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.sendPacket(new ItemList(targetPlayer, false));
targetIU.addNewItem(newItem);
}
targetPlayer.sendPacket(targetIU);
// Update current load as well
playerSU = new StatusUpdate(targetPlayer);
@@ -3607,16 +3545,9 @@ public class Player extends Playable
}
// Send inventory update packet
if (!Config.FORCE_INVENTORY_UPDATE)
{
final InventoryUpdate playerIU = new InventoryUpdate();
playerIU.addItem(droppedItem);
sendPacket(playerIU);
}
else
{
sendPacket(new ItemList(this, false));
}
final InventoryUpdate playerIU = new InventoryUpdate();
playerIU.addItem(droppedItem);
sendPacket(playerIU);
// Update current load as well
final StatusUpdate su = new StatusUpdate(this);
@@ -3686,16 +3617,9 @@ public class Player extends Playable
}
// Send inventory update packet
if (!Config.FORCE_INVENTORY_UPDATE)
{
final InventoryUpdate playerIU = new InventoryUpdate();
playerIU.addItem(invitem);
sendPacket(playerIU);
}
else
{
sendPacket(new ItemList(this, false));
}
final InventoryUpdate playerIU = new InventoryUpdate();
playerIU.addItem(invitem);
sendPacket(playerIU);
// Update current load as well
final StatusUpdate su = new StatusUpdate(this);
@@ -5885,16 +5809,9 @@ public class Player extends Playable
return;
}
if (!Config.FORCE_INVENTORY_UPDATE)
{
final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(arrows);
sendPacket(iu);
}
else
{
sendPacket(new ItemList(this, false));
}
final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(arrows);
sendPacket(iu);
}
/**

17
L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
View File

@@ -465,23 +465,16 @@ public class PlayerInventory extends Inventory
if (actor != null)
{
// Send inventory update packet
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.sendPacket(playerIU);
playerIU.addModifiedItem(item);
}
else
{
actor.sendPacket(new ItemList(actor, false));
playerIU.addNewItem(item);
}
actor.sendPacket(playerIU);
// Update current load as well
final StatusUpdate su = new StatusUpdate(actor);

18
L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
View File

@@ -31,7 +31,6 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.ItemList;
import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.util.Util;
@@ -189,23 +188,16 @@ 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.sendPacket(iu);
iu.addRemovedItem(removedItem);
}
else
{
player.sendPacket(new ItemList(player, true));
iu.addModifiedItem(removedItem);
}
player.sendPacket(iu);
final StatusUpdate su = new StatusUpdate(player);
su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad());

59
L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
View File

@@ -34,7 +34,6 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.EnchantResult;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.ItemList;
import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
@@ -409,45 +408,37 @@ public class RequestEnchantItem implements IClientIncomingPacket
final StatusUpdate su = new StatusUpdate(player);
su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad());
player.sendPacket(su);
if (!Config.FORCE_INVENTORY_UPDATE)
if (scroll.getCount() == 0)
{
if (scroll.getCount() == 0)
{
iu.addRemovedItem(scroll);
}
else
{
iu.addModifiedItem(scroll);
}
if (item.getCount() == 0)
{
iu.addRemovedItem(item);
}
else
{
iu.addModifiedItem(item);
}
if (support != null)
{
if (support.getCount() == 0)
{
iu.addRemovedItem(support);
}
else
{
iu.addModifiedItem(support);
}
}
player.sendPacket(iu);
iu.addRemovedItem(scroll);
}
else
{
player.sendPacket(new ItemList(player, true));
iu.addModifiedItem(scroll);
}
if (item.getCount() == 0)
{
iu.addRemovedItem(item);
}
else
{
iu.addModifiedItem(item);
}
if (support != null)
{
if (support.getCount() == 0)
{
iu.addRemovedItem(support);
}
else
{
iu.addModifiedItem(support);
}
}
player.sendPacket(iu);
player.broadcastUserInfo();
player.setActiveEnchantItemId(Player.ID_NONE);
}

20
L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java
View File

@@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.ItemList;
import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate;
import org.l2jmobius.gameserver.util.Util;
@@ -165,7 +164,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
@@ -184,16 +183,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.
@@ -204,7 +200,7 @@ public class RequestPackageSend implements IClientIncomingPacket
warehouse.deleteMe();
// Send updated item list to the player
player.sendPacket(playerIU != null ? playerIU : new ItemList(player, false));
player.sendPacket(playerIU);
// Update current load status on player
final StatusUpdate su = new StatusUpdate(player);

27
L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
View File

@@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.ItemList;
import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate;
import org.l2jmobius.gameserver.util.Util;
@@ -170,7 +169,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
@@ -193,28 +192,18 @@ 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.sendPacket(playerIU);
}
else
{
player.sendPacket(new ItemList(player, false));
}
player.sendPacket(playerIU);
// Update current load status on player
final StatusUpdate su = new StatusUpdate(player);

27
L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java
View File

@@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.ItemList;
import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate;
import org.l2jmobius.gameserver.util.Util;
@@ -165,7 +164,7 @@ public class SendWareHouseWithDrawList 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)
{
final Item oldItem = warehouse.getItemByObjectId(i.getId());
@@ -181,28 +180,18 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
return;
}
if (playerIU != null)
if (newItem.getCount() > i.getCount())
{
if (newItem.getCount() > i.getCount())
{
playerIU.addModifiedItem(newItem);
}
else
{
playerIU.addNewItem(newItem);
}
playerIU.addModifiedItem(newItem);
}
else
{
playerIU.addNewItem(newItem);
}
}
// Send updated item list to the player
if (playerIU != null)
{
player.sendPacket(playerIU);
}
else
{
player.sendPacket(new ItemList(player, false));
}
player.sendPacket(playerIU);
// Update current load status on player
final StatusUpdate su = new StatusUpdate(player);