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_C6_Interlude/java/org/l2jmobius/Config.java
View File

@@ -346,7 +346,6 @@ public class Config
public static int RIFT_ENTER_COST_COMMANDER;
public static int RIFT_ENTER_COST_HERO;
public static float RIFT_BOSS_ROOM_TIME_MUTIPLY;
public static boolean FORCE_INVENTORY_UPDATE;
public static boolean ALT_GAME_KARMA_PLAYER_CAN_BE_KILLED_IN_PEACEZONE;
public static boolean ALT_GAME_KARMA_PLAYER_CAN_SHOP;
public static boolean ALT_GAME_KARMA_PLAYER_CAN_USE_GK;
@@ -1541,7 +1540,6 @@ public class Config
SHOW_NPC_AGGRESSION = generalConfig.getBoolean("ShowNpcAggression", false);
SHOW_NPC_CLAN_CREST = generalConfig.getBoolean("ShowNpcClanCrest", false);
ATTACKABLES_CAMP_PLAYER_CORPSES = generalConfig.getBoolean("AttackablesCampPlayerCorpses", false);
FORCE_INVENTORY_UPDATE = generalConfig.getBoolean("ForceInventoryUpdate", false);
FORCE_COMPLETE_STATUS_UPDATE = generalConfig.getBoolean("ForceCompletePlayerStatusUpdate", true);
CHAR_DATA_STORE_INTERVAL = generalConfig.getInt("CharacterDataStoreInterval", 15) * 60 * 1000;
UPDATE_ITEMS_ON_CHAR_STORE = generalConfig.getBoolean("UpdateItemsOnCharStore", false);

7
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Charge.java
View File

@@ -20,7 +20,6 @@ import java.util.List;
import org.l2jmobius.gameserver.handler.ISkillHandler;
import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.effects.Effect;
@@ -36,13 +35,13 @@ public class Charge implements ISkillHandler
@Override
public void useSkill(Creature creature, Skill skill, List<Creature> targets)
{
for (WorldObject target1 : targets)
for (Creature target : targets)
{
if (!(target1 instanceof Player))
if (!(target instanceof Player))
{
continue;
}
final Player target = (Player) target1;
skill.applyEffects(creature, target, false, false, false);
}

18
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Harvest.java
View File

@@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.handler.skillhandlers;
import java.util.List;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.handler.ISkillHandler;
import org.l2jmobius.gameserver.model.Skill;
@@ -31,7 +30,6 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.skill.SkillType;
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.SystemMessage;
/**
@@ -58,7 +56,7 @@ public class Harvest implements ISkillHandler
_player = (Player) creature;
final List<Creature> targetList = skill.getTargetList(creature);
final InventoryUpdate iu = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
final InventoryUpdate iu = new InventoryUpdate();
if (targetList == null)
{
return;
@@ -100,10 +98,7 @@ public class Harvest implements ISkillHandler
else
{
final Item item = _player.getInventory().addItem("Manor", ritem.getId(), ritem.getCount(), _player, _target);
if (iu != null)
{
iu.addItem(item);
}
iu.addItem(item);
send = true;
total += ritem.getCount();
}
@@ -124,14 +119,7 @@ public class Harvest implements ISkillHandler
_player.getParty().broadcastToPartyMembers(_player, smsg);
}
if (iu != null)
{
_player.sendPacket(iu);
}
else
{
_player.sendPacket(new ItemList(_player, false));
}
_player.sendPacket(iu);
}
}
}

9
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Recall.java
View File

@@ -22,7 +22,6 @@ import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.handler.ISkillHandler;
import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.skill.SkillType;
@@ -71,14 +70,8 @@ public class Recall implements ISkillHandler
}
}
for (WorldObject target1 : targets)
for (Creature target : targets)
{
if (!(target1 instanceof Creature))
{
continue;
}
final Creature target = (Creature) target1;
if (target instanceof Player)
{
final Player targetChar = (Player) target;

5
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Spoil.java
View File

@@ -21,7 +21,6 @@ import java.util.List;
import org.l2jmobius.gameserver.ai.CtrlEvent;
import org.l2jmobius.gameserver.handler.ISkillHandler;
import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.instance.Monster;
@@ -53,7 +52,7 @@ public class Spoil implements ISkillHandler
return;
}
for (WorldObject target1 : targets)
for (Creature target1 : targets)
{
if (!(target1 instanceof Monster))
{
@@ -70,7 +69,7 @@ public class Spoil implements ISkillHandler
boolean spoil = false;
if (!target.isDead())
{
spoil = Formulas.calcMagicSuccess(creature, (Creature) target1, skill);
spoil = Formulas.calcMagicSuccess(creature, target1, skill);
if (spoil)
{
target.setSpoil(true);

21
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Sweep.java
View File

@@ -18,10 +18,8 @@ package org.l2jmobius.gameserver.handler.skillhandlers;
import java.util.List;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.ISkillHandler;
import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Attackable;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -30,7 +28,6 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.skill.SkillType;
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.SystemMessage;
/**
@@ -52,9 +49,9 @@ public class Sweep implements ISkillHandler
}
final Player player = (Player) creature;
final InventoryUpdate iu = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
final InventoryUpdate iu = new InventoryUpdate();
boolean send = false;
for (WorldObject target1 : targets)
for (Creature target1 : targets)
{
if (!(target1 instanceof Attackable))
{
@@ -88,10 +85,7 @@ public class Sweep implements ISkillHandler
else
{
final Item item = player.getInventory().addItem("Sweep", ritem.getId(), ritem.getCount(), player, target);
if (iu != null)
{
iu.addItem(item);
}
iu.addItem(item);
send = true;
SystemMessage smsg;
if (ritem.getCount() > 1)
@@ -113,14 +107,7 @@ public class Sweep implements ISkillHandler
if (send)
{
if (iu != null)
{
player.sendPacket(iu);
}
else
{
player.sendPacket(new ItemList(player, false));
}
player.sendPacket(iu);
}
}
}

9
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ZakenPlayer.java
View File

@@ -21,7 +21,6 @@ import java.util.List;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.handler.ISkillHandler;
import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.skill.SkillType;
@@ -37,14 +36,8 @@ public class ZakenPlayer implements ISkillHandler
{
try
{
for (WorldObject target1 : targets)
for (Creature target : targets)
{
if (!(target1 instanceof Creature))
{
continue;
}
final Creature target = (Creature) target1;
switch (Rnd.get(14) + 1)
{
case 1:

9
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ZakenSelf.java
View File

@@ -21,7 +21,6 @@ import java.util.List;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.handler.ISkillHandler;
import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.skill.SkillType;
@@ -37,14 +36,8 @@ public class ZakenSelf implements ISkillHandler
{
try
{
for (WorldObject target1 : targets)
for (Creature target : targets)
{
if (!(target1 instanceof Creature))
{
continue;
}
final Creature target = (Creature) target1;
switch (Rnd.get(14) + 1)
{
case 1:

15
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/CombatFlag.java
View File

@@ -16,14 +16,12 @@
*/
package org.l2jmobius.gameserver.model;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.data.SkillTable;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.instance.Item;
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.SystemMessage;
/**
@@ -96,16 +94,9 @@ public class CombatFlag
_player.sendPacket(sm);
// Refresh inventory
if (!Config.FORCE_INVENTORY_UPDATE)
{
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_item);
_player.sendPacket(iu);
}
else
{
_player.sendPacket(new ItemList(_player, false));
}
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_item);
_player.sendPacket(iu);
// Refresh player stats
_player.broadcastUserInfo();

24
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java
View File

@@ -31,7 +31,6 @@ import org.l2jmobius.gameserver.model.item.type.EtcItemType;
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;
@@ -772,31 +771,16 @@ 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.sendPacket(ownerIU);
}
else
{
_owner.sendPacket(new ItemList(_owner, false));
}
if (partnerIU != null)
{
_partner.sendPacket(partnerIU);
}
else
{
_partner.sendPacket(new ItemList(_partner, false));
}
_owner.sendPacket(ownerIU);
_partner.sendPacket(partnerIU);
// Update current load as well
StatusUpdate playerSU = new StatusUpdate(_owner.getObjectId());

228
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@@ -3291,22 +3291,15 @@ public class Player extends Playable
}
// 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);
}
}
}
@@ -3336,16 +3329,9 @@ public class Player extends Playable
_inventory.reduceAdena(process, count, this, reference);
// 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)
{
@@ -3378,16 +3364,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());
sendPacket(iu);
}
else
{
sendPacket(new ItemList(this, false));
}
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_inventory.getAncientAdenaInstance());
sendPacket(iu);
}
}
@@ -3414,16 +3394,10 @@ public class Player extends Playable
{
final Item ancientAdenaItem = _inventory.getAncientAdenaInstance();
_inventory.reduceAncientAdena(process, count, this, reference);
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)
{
@@ -3486,16 +3460,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(getObjectId());
@@ -3602,16 +3569,9 @@ public class Player extends Playable
final Item item = _inventory.addItem(process, itemId, count, this, reference);
// 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(getObjectId());
@@ -3652,16 +3612,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(getObjectId());
@@ -3712,16 +3665,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(getObjectId());
@@ -3787,16 +3733,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(getObjectId());
@@ -3839,16 +3778,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(getObjectId());
@@ -3947,23 +3879,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(getObjectId());
@@ -3974,23 +3899,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.getObjectId());
@@ -4064,16 +3982,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(getObjectId());
@@ -4145,16 +4056,9 @@ public class Player extends Playable
}
// Send inventory update packet.
if (!Config.FORCE_INVENTORY_UPDATE)
{
final InventoryUpdate playerIU = new InventoryUpdate();
playerIU.addItem(inventoryItem);
sendPacket(playerIU);
}
else
{
sendPacket(new ItemList(this, false));
}
final InventoryUpdate playerIU = new InventoryUpdate();
playerIU.addItem(inventoryItem);
sendPacket(playerIU);
// Update current load as well.
final StatusUpdate su = new StatusUpdate(getObjectId());
@@ -6117,12 +6021,9 @@ public class Player extends Playable
sendMessage("You have earned " + amount + " item(s) of " + reward.getName() + ".");
}
if (!Config.FORCE_INVENTORY_UPDATE)
{
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_inventory.getItemByItemId(Config.PVP_REWARD_ID));
sendPacket(iu);
}
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_inventory.getItemByItemId(Config.PVP_REWARD_ID));
sendPacket(iu);
}
else // target is not pk and not in pvp ---> PK KILL
{
@@ -6135,12 +6036,9 @@ public class Player extends Playable
sendMessage("You have earned " + amount + " item(s) of " + reward.getName() + ".");
}
if (!Config.FORCE_INVENTORY_UPDATE)
{
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_inventory.getItemByItemId(Config.PK_REWARD_ID));
sendPacket(iu);
}
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_inventory.getItemByItemId(Config.PK_REWARD_ID));
sendPacket(iu);
}
}
else
@@ -6926,16 +6824,10 @@ public class Player extends Playable
_arrowItem = null;
sendPacket(new ItemList(this, false));
}
else 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);
}
/**

38
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
View File

@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.World;
@@ -29,7 +28,6 @@ import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
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.IllegalPlayerAction;
@@ -193,34 +191,26 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
player.sendPacket(sm);
// send inventory update
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);
}
if (createditem.getCount() != crystalAmount)
{
iu.addModifiedItem(createditem);
}
else
{
iu.addNewItem(createditem);
}
player.sendPacket(iu);
iu.addRemovedItem(removedItem);
}
else
{
player.sendPacket(new ItemList(player, false));
iu.addModifiedItem(removedItem);
}
if (createditem.getCount() != crystalAmount)
{
iu.addModifiedItem(createditem);
}
else
{
iu.addNewItem(createditem);
}
player.sendPacket(iu);
// status & user info
final StatusUpdate su = new StatusUpdate(player.getObjectId());
su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad());

20
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.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;
@@ -155,25 +154,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);
}
// client.getConnection().sendPacket(iu);
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.getObjectId());
su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad());

20
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
View File

@@ -715,25 +715,17 @@ public class RequestEnchantItem implements IClientIncomingPacket
sm.addNumber(count);
player.sendPacket(sm);
if (!Config.FORCE_INVENTORY_UPDATE)
final InventoryUpdate iu = new InventoryUpdate();
if (destroyItem.getCount() == 0)
{
final InventoryUpdate iu = new InventoryUpdate();
if (destroyItem.getCount() == 0)
{
iu.addRemovedItem(destroyItem);
}
else
{
iu.addModifiedItem(destroyItem);
}
iu.addItem(crystals);
player.sendPacket(iu);
iu.addRemovedItem(destroyItem);
}
else
{
player.sendPacket(new ItemList(player, true));
iu.addModifiedItem(destroyItem);
}
iu.addItem(crystals);
player.sendPacket(iu);
final StatusUpdate su = new StatusUpdate(player.getObjectId());
su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad());

27
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java
View File

@@ -34,7 +34,6 @@ import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.ItemList;
import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate;
/**
@@ -199,7 +198,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)
{
final int objectId = i.id;
@@ -231,28 +230,18 @@ 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);
}
}
// 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.getObjectId());

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

@@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
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.StatusUpdate;
public class SendWareHouseDepositList implements IClientIncomingPacket
@@ -210,7 +209,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 (int i = 0; i < _count; i++)
{
final int objectId = _items[(i * 2) + 0];
@@ -253,28 +252,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.getObjectId());

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

@@ -31,7 +31,6 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
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.StatusUpdate;
import org.l2jmobius.gameserver.util.Util;
@@ -180,7 +179,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 (int i = 0; i < _count; i++)
{
final int objectId = _items[(i * 2) + 0];
@@ -197,28 +196,18 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
continue;
}
if (playerIU != null)
if (newItem.getCount() > count)
{
if (newItem.getCount() > count)
{
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.getObjectId());