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

Removed force inventory update configuration from CursedWeapon.

Browse Source 
Thanks to nasseka.
This commit is contained in:
MobiusDevelopment
2022-03-02 12:03:06 +00:00
parent 0a2a6a5388
commit bd36c2ecf3
23 changed files with 115 additions and 1221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/CursedWeapon.java
View File

@ -23,7 +23,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Chronos;
@ -42,7 +41,6 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.Earthquake; import org.l2jmobius.gameserver.network.serverpackets.Earthquake;
import org.l2jmobius.gameserver.network.serverpackets.ExRedSky; import org.l2jmobius.gameserver.network.serverpackets.ExRedSky;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction; import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo; import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
@ -109,26 +107,8 @@ public class CursedWeapon implements INamable
_player.storeMe(); _player.storeMe();
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList(false);
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList(false);
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
else else
@ -170,26 +150,8 @@ public class CursedWeapon implements INamable
if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null)) if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null))
{ {
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList(false);
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList(false);
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
// is dropped on the ground // is dropped on the ground
@ -430,7 +392,6 @@ public class CursedWeapon implements INamable
// Equip with the weapon // Equip with the weapon
_item = item; _item = item;
// Item[] items =
_player.getInventory().equipItem(_item); _player.getInventory().equipItem(_item);
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1); SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1);
sm.addItemName(_item); sm.addItemName(_item);
@ -441,16 +402,7 @@ public class CursedWeapon implements INamable
_player.setCurrentCp(_player.getMaxCp()); _player.setCurrentCp(_player.getMaxCp());
// Refresh inventory // Refresh inventory
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList(false);
{
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_item);
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList(false);
}
// Refresh player stats // Refresh player stats
_player.broadcastUserInfo(); _player.broadcastUserInfo();

58
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/CursedWeapon.java
View File

@ -23,7 +23,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Chronos;
@ -42,7 +41,6 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.Earthquake; import org.l2jmobius.gameserver.network.serverpackets.Earthquake;
import org.l2jmobius.gameserver.network.serverpackets.ExRedSky; import org.l2jmobius.gameserver.network.serverpackets.ExRedSky;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction; import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo; import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
@ -109,26 +107,8 @@ public class CursedWeapon implements INamable
_player.storeMe(); _player.storeMe();
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList(false);
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList(false);
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
else else
@ -170,26 +150,8 @@ public class CursedWeapon implements INamable
if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null)) if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null))
{ {
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList(false);
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList(false);
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
// is dropped on the ground // is dropped on the ground
@ -430,7 +392,6 @@ public class CursedWeapon implements INamable
// Equip with the weapon // Equip with the weapon
_item = item; _item = item;
// Item[] items =
_player.getInventory().equipItem(_item); _player.getInventory().equipItem(_item);
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1); SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1);
sm.addItemName(_item); sm.addItemName(_item);
@ -441,16 +402,7 @@ public class CursedWeapon implements INamable
_player.setCurrentCp(_player.getMaxCp()); _player.setCurrentCp(_player.getMaxCp());
// Refresh inventory // Refresh inventory
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList(false);
{
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_item);
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList(false);
}
// Refresh player stats // Refresh player stats
_player.broadcastUserInfo(); _player.broadcastUserInfo();

58
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/CursedWeapon.java
View File

@ -23,7 +23,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Chronos;
@ -42,7 +41,6 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.Earthquake; import org.l2jmobius.gameserver.network.serverpackets.Earthquake;
import org.l2jmobius.gameserver.network.serverpackets.ExRedSky; import org.l2jmobius.gameserver.network.serverpackets.ExRedSky;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction; import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo; import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
@ -109,26 +107,8 @@ public class CursedWeapon implements INamable
_player.storeMe(); _player.storeMe();
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList(false);
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList(false);
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
else else
@ -170,26 +150,8 @@ public class CursedWeapon implements INamable
if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null)) if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null))
{ {
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList(false);
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList(false);
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
// is dropped on the ground // is dropped on the ground
@ -430,7 +392,6 @@ public class CursedWeapon implements INamable
// Equip with the weapon // Equip with the weapon
_item = item; _item = item;
// Item[] items =
_player.getInventory().equipItem(_item); _player.getInventory().equipItem(_item);
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1); SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1);
sm.addItemName(_item); sm.addItemName(_item);
@ -441,16 +402,7 @@ public class CursedWeapon implements INamable
_player.setCurrentCp(_player.getMaxCp()); _player.setCurrentCp(_player.getMaxCp());
// Refresh inventory // Refresh inventory
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList(false);
{
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_item);
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList(false);
}
// Refresh player stats // Refresh player stats
_player.broadcastUserInfo(); _player.broadcastUserInfo();

58
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/CursedWeapon.java
View File

@ -23,7 +23,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Chronos;
@ -42,7 +41,6 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.Earthquake; import org.l2jmobius.gameserver.network.serverpackets.Earthquake;
import org.l2jmobius.gameserver.network.serverpackets.ExRedSky; import org.l2jmobius.gameserver.network.serverpackets.ExRedSky;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction; import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo; import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
@ -109,26 +107,8 @@ public class CursedWeapon implements INamable
_player.storeMe(); _player.storeMe();
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList(false);
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList(false);
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
else else
@ -170,26 +150,8 @@ public class CursedWeapon implements INamable
if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null)) if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null))
{ {
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList(false);
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList(false);
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
// is dropped on the ground // is dropped on the ground
@ -430,7 +392,6 @@ public class CursedWeapon implements INamable
// Equip with the weapon // Equip with the weapon
_item = item; _item = item;
// Item[] items =
_player.getInventory().equipItem(_item); _player.getInventory().equipItem(_item);
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1); SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1);
sm.addItemName(_item); sm.addItemName(_item);
@ -441,16 +402,7 @@ public class CursedWeapon implements INamable
_player.setCurrentCp(_player.getMaxCp()); _player.setCurrentCp(_player.getMaxCp());
// Refresh inventory // Refresh inventory
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList(false);
{
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_item);
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList(false);
}
// Refresh player stats // Refresh player stats
_player.broadcastUserInfo(); _player.broadcastUserInfo();

58
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/CursedWeapon.java
View File

@ -23,7 +23,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Chronos;
@ -42,7 +41,6 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.Earthquake; import org.l2jmobius.gameserver.network.serverpackets.Earthquake;
import org.l2jmobius.gameserver.network.serverpackets.ExRedSky; import org.l2jmobius.gameserver.network.serverpackets.ExRedSky;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction; import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo; import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
@ -109,26 +107,8 @@ public class CursedWeapon implements INamable
_player.storeMe(); _player.storeMe();
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
else else
@ -170,26 +150,8 @@ public class CursedWeapon implements INamable
if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null)) if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null))
{ {
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
// is dropped on the ground // is dropped on the ground
@ -430,7 +392,6 @@ public class CursedWeapon implements INamable
// Equip with the weapon // Equip with the weapon
_item = item; _item = item;
// Item[] items =
_player.getInventory().equipItem(_item); _player.getInventory().equipItem(_item);
SystemMessage sm = new SystemMessage(SystemMessageId.EQUIPPED_S1); SystemMessage sm = new SystemMessage(SystemMessageId.EQUIPPED_S1);
sm.addItemName(_item); sm.addItemName(_item);
@ -441,16 +402,7 @@ public class CursedWeapon implements INamable
_player.setCurrentCp(_player.getMaxCp()); _player.setCurrentCp(_player.getMaxCp());
// Refresh inventory // Refresh inventory
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_item);
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
// Refresh player stats // Refresh player stats
_player.broadcastUserInfo(); _player.broadcastUserInfo();

58
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/CursedWeapon.java
View File

@ -23,7 +23,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Chronos;
@ -42,7 +41,6 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.Earthquake; import org.l2jmobius.gameserver.network.serverpackets.Earthquake;
import org.l2jmobius.gameserver.network.serverpackets.ExRedSky; import org.l2jmobius.gameserver.network.serverpackets.ExRedSky;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction; import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo; import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
@ -109,26 +107,8 @@ public class CursedWeapon implements INamable
_player.storeMe(); _player.storeMe();
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
else else
@ -170,26 +150,8 @@ public class CursedWeapon implements INamable
if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null)) if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null))
{ {
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
// is dropped on the ground // is dropped on the ground
@ -430,7 +392,6 @@ public class CursedWeapon implements INamable
// Equip with the weapon // Equip with the weapon
_item = item; _item = item;
// Item[] items =
_player.getInventory().equipItem(_item); _player.getInventory().equipItem(_item);
SystemMessage sm = new SystemMessage(SystemMessageId.EQUIPPED_S1); SystemMessage sm = new SystemMessage(SystemMessageId.EQUIPPED_S1);
sm.addItemName(_item); sm.addItemName(_item);
@ -441,16 +402,7 @@ public class CursedWeapon implements INamable
_player.setCurrentCp(_player.getMaxCp()); _player.setCurrentCp(_player.getMaxCp());
// Refresh inventory // Refresh inventory
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_item);
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
// Refresh player stats // Refresh player stats
_player.broadcastUserInfo(); _player.broadcastUserInfo();

58
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/CursedWeapon.java
View File

@ -23,7 +23,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Chronos;
@ -42,7 +41,6 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.Earthquake; import org.l2jmobius.gameserver.network.serverpackets.Earthquake;
import org.l2jmobius.gameserver.network.serverpackets.ExRedSky; import org.l2jmobius.gameserver.network.serverpackets.ExRedSky;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction; import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo; import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
@ -109,26 +107,8 @@ public class CursedWeapon implements INamable
_player.storeMe(); _player.storeMe();
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
else else
@ -170,26 +150,8 @@ public class CursedWeapon implements INamable
if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null)) if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null))
{ {
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
// is dropped on the ground // is dropped on the ground
@ -430,7 +392,6 @@ public class CursedWeapon implements INamable
// Equip with the weapon // Equip with the weapon
_item = item; _item = item;
// Item[] items =
_player.getInventory().equipItem(_item); _player.getInventory().equipItem(_item);
SystemMessage sm = new SystemMessage(SystemMessageId.EQUIPPED_S1); SystemMessage sm = new SystemMessage(SystemMessageId.EQUIPPED_S1);
sm.addItemName(_item); sm.addItemName(_item);
@ -441,16 +402,7 @@ public class CursedWeapon implements INamable
_player.setCurrentCp(_player.getMaxCp()); _player.setCurrentCp(_player.getMaxCp());
// Refresh inventory // Refresh inventory
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_item);
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
// Refresh player stats // Refresh player stats
_player.broadcastUserInfo(); _player.broadcastUserInfo();

58
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/CursedWeapon.java
View File

@ -23,7 +23,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Chronos;
@ -42,7 +41,6 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.Earthquake; import org.l2jmobius.gameserver.network.serverpackets.Earthquake;
import org.l2jmobius.gameserver.network.serverpackets.ExRedSky; import org.l2jmobius.gameserver.network.serverpackets.ExRedSky;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction; import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo; import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
@ -109,26 +107,8 @@ public class CursedWeapon implements INamable
_player.storeMe(); _player.storeMe();
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
else else
@ -170,26 +150,8 @@ public class CursedWeapon implements INamable
if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null)) if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null))
{ {
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
// is dropped on the ground // is dropped on the ground
@ -433,7 +395,6 @@ public class CursedWeapon implements INamable
// Equip with the weapon // Equip with the weapon
_item = item; _item = item;
// Item[] items =
_player.getInventory().equipItem(_item); _player.getInventory().equipItem(_item);
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1); SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1);
sm.addItemName(_item); sm.addItemName(_item);
@ -444,16 +405,7 @@ public class CursedWeapon implements INamable
_player.setCurrentCp(_player.getMaxCp()); _player.setCurrentCp(_player.getMaxCp());
// Refresh inventory // Refresh inventory
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_item);
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
// Refresh player stats // Refresh player stats
_player.broadcastUserInfo(); _player.broadcastUserInfo();

58
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/CursedWeapon.java
View File

@ -23,7 +23,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Chronos;
@ -42,7 +41,6 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.Earthquake; import org.l2jmobius.gameserver.network.serverpackets.Earthquake;
import org.l2jmobius.gameserver.network.serverpackets.ExRedSky; import org.l2jmobius.gameserver.network.serverpackets.ExRedSky;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction; import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo; import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
@ -109,26 +107,8 @@ public class CursedWeapon implements INamable
_player.storeMe(); _player.storeMe();
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
else else
@ -170,26 +150,8 @@ public class CursedWeapon implements INamable
if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null)) if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null))
{ {
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
// is dropped on the ground // is dropped on the ground
@ -433,7 +395,6 @@ public class CursedWeapon implements INamable
// Equip with the weapon // Equip with the weapon
_item = item; _item = item;
// Item[] items =
_player.getInventory().equipItem(_item); _player.getInventory().equipItem(_item);
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1); SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1);
sm.addItemName(_item); sm.addItemName(_item);
@ -444,16 +405,7 @@ public class CursedWeapon implements INamable
_player.setCurrentCp(_player.getMaxCp()); _player.setCurrentCp(_player.getMaxCp());
// Refresh inventory // Refresh inventory
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_item);
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
// Refresh player stats // Refresh player stats
_player.broadcastUserInfo(); _player.broadcastUserInfo();

58
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/CursedWeapon.java
View File

@ -23,7 +23,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Chronos;
@ -42,7 +41,6 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.Earthquake; import org.l2jmobius.gameserver.network.serverpackets.Earthquake;
import org.l2jmobius.gameserver.network.serverpackets.ExRedSky; import org.l2jmobius.gameserver.network.serverpackets.ExRedSky;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction; import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo; import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
@ -109,26 +107,8 @@ public class CursedWeapon implements INamable
_player.storeMe(); _player.storeMe();
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
else else
@ -170,26 +150,8 @@ public class CursedWeapon implements INamable
if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null)) if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null))
{ {
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
// is dropped on the ground // is dropped on the ground
@ -433,7 +395,6 @@ public class CursedWeapon implements INamable
// Equip with the weapon // Equip with the weapon
_item = item; _item = item;
// Item[] items =
_player.getInventory().equipItem(_item); _player.getInventory().equipItem(_item);
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1); SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1);
sm.addItemName(_item); sm.addItemName(_item);
@ -444,16 +405,7 @@ public class CursedWeapon implements INamable
_player.setCurrentCp(_player.getMaxCp()); _player.setCurrentCp(_player.getMaxCp());
// Refresh inventory // Refresh inventory
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_item);
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
// Refresh player stats // Refresh player stats
_player.broadcastUserInfo(); _player.broadcastUserInfo();

58
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/CursedWeapon.java
View File

@ -23,7 +23,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Chronos;
@ -42,7 +41,6 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.Earthquake; import org.l2jmobius.gameserver.network.serverpackets.Earthquake;
import org.l2jmobius.gameserver.network.serverpackets.ExRedSky; import org.l2jmobius.gameserver.network.serverpackets.ExRedSky;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction; import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo; import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
@ -109,26 +107,8 @@ public class CursedWeapon implements INamable
_player.storeMe(); _player.storeMe();
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
else else
@ -170,26 +150,8 @@ public class CursedWeapon implements INamable
if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null)) if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null))
{ {
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
// is dropped on the ground // is dropped on the ground
@ -433,7 +395,6 @@ public class CursedWeapon implements INamable
// Equip with the weapon // Equip with the weapon
_item = item; _item = item;
// Item[] items =
_player.getInventory().equipItem(_item); _player.getInventory().equipItem(_item);
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_S1); SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_S1);
sm.addItemName(_item); sm.addItemName(_item);
@ -444,16 +405,7 @@ public class CursedWeapon implements INamable
_player.setCurrentCp(_player.getMaxCp()); _player.setCurrentCp(_player.getMaxCp());
// Refresh inventory // Refresh inventory
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_item);
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
// Refresh player stats // Refresh player stats
_player.broadcastUserInfo(); _player.broadcastUserInfo();

59
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/CursedWeapon.java
View File

@ -23,7 +23,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Chronos;
@ -43,7 +42,6 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.Earthquake; import org.l2jmobius.gameserver.network.serverpackets.Earthquake;
import org.l2jmobius.gameserver.network.serverpackets.ExRedSky; import org.l2jmobius.gameserver.network.serverpackets.ExRedSky;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.ItemList;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction; import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
@ -111,26 +109,8 @@ public class CursedWeapon implements INamable
_player.storeMe(); _player.storeMe();
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendPacket(new ItemList(_player, true));
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendPacket(iu);
}
else
{
_player.sendPacket(new ItemList(_player, true));
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
else else
@ -170,26 +150,8 @@ public class CursedWeapon implements INamable
else if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null)) else if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null))
{ {
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendPacket(new ItemList(_player, true));
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendPacket(iu);
}
else
{
_player.sendPacket(new ItemList(_player, true));
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
// is dropped on the ground // is dropped on the ground
@ -434,7 +396,6 @@ public class CursedWeapon implements INamable
// Equip with the weapon // Equip with the weapon
_item = item; _item = item;
// Item[] items =
_player.getInventory().equipItem(_item); _player.getInventory().equipItem(_item);
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1); SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1);
sm.addItemName(_item); sm.addItemName(_item);
@ -445,17 +406,7 @@ public class CursedWeapon implements INamable
_player.setCurrentCp(_player.getMaxCp()); _player.setCurrentCp(_player.getMaxCp());
// Refresh inventory // Refresh inventory
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendPacket(new ItemList(_player, false));
{
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_item);
// iu.addItems(Arrays.asList(items));
_player.sendPacket(iu);
}
else
{
_player.sendPacket(new ItemList(_player, false));
}
// Refresh player stats // Refresh player stats
_player.broadcastUserInfo(); _player.broadcastUserInfo();

59
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/CursedWeapon.java
View File

@ -23,7 +23,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Chronos;
@ -43,7 +42,6 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.Earthquake; import org.l2jmobius.gameserver.network.serverpackets.Earthquake;
import org.l2jmobius.gameserver.network.serverpackets.ExRedSky; import org.l2jmobius.gameserver.network.serverpackets.ExRedSky;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.ItemList;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction; import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
@ -111,26 +109,8 @@ public class CursedWeapon implements INamable
_player.storeMe(); _player.storeMe();
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendPacket(new ItemList(_player, true));
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendPacket(iu);
}
else
{
_player.sendPacket(new ItemList(_player, true));
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
else else
@ -170,26 +150,8 @@ public class CursedWeapon implements INamable
else if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null)) else if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null))
{ {
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendPacket(new ItemList(_player, true));
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendPacket(iu);
}
else
{
_player.sendPacket(new ItemList(_player, true));
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
// is dropped on the ground // is dropped on the ground
@ -434,7 +396,6 @@ public class CursedWeapon implements INamable
// Equip with the weapon // Equip with the weapon
_item = item; _item = item;
// Item[] items =
_player.getInventory().equipItem(_item); _player.getInventory().equipItem(_item);
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1); SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1);
sm.addItemName(_item); sm.addItemName(_item);
@ -445,17 +406,7 @@ public class CursedWeapon implements INamable
_player.setCurrentCp(_player.getMaxCp()); _player.setCurrentCp(_player.getMaxCp());
// Refresh inventory // Refresh inventory
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendPacket(new ItemList(_player, false));
{
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_item);
// iu.addItems(Arrays.asList(items));
_player.sendPacket(iu);
}
else
{
_player.sendPacket(new ItemList(_player, false));
}
// Refresh player stats // Refresh player stats
_player.broadcastUserInfo(); _player.broadcastUserInfo();

58
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/CursedWeapon.java
View File

@ -23,7 +23,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Chronos;
@ -42,7 +41,6 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.Earthquake; import org.l2jmobius.gameserver.network.serverpackets.Earthquake;
import org.l2jmobius.gameserver.network.serverpackets.ExRedSky; import org.l2jmobius.gameserver.network.serverpackets.ExRedSky;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction; import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo; import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
@ -109,26 +107,8 @@ public class CursedWeapon implements INamable
_player.storeMe(); _player.storeMe();
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList(false);
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList(false);
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
else else
@ -170,26 +150,8 @@ public class CursedWeapon implements INamable
if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null)) if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null))
{ {
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList(false);
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList(false);
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
// is dropped on the ground // is dropped on the ground
@ -430,7 +392,6 @@ public class CursedWeapon implements INamable
// Equip with the weapon // Equip with the weapon
_item = item; _item = item;
// Item[] items =
_player.getInventory().equipItem(_item); _player.getInventory().equipItem(_item);
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1); SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1);
sm.addItemName(_item); sm.addItemName(_item);
@ -441,16 +402,7 @@ public class CursedWeapon implements INamable
_player.setCurrentCp(_player.getMaxCp()); _player.setCurrentCp(_player.getMaxCp());
// Refresh inventory // Refresh inventory
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList(false);
{
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_item);
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList(false);
}
// Refresh player stats // Refresh player stats
_player.broadcastUserInfo(); _player.broadcastUserInfo();

58
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/CursedWeapon.java
View File

@ -23,7 +23,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Chronos;
@ -42,7 +41,6 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.Earthquake; import org.l2jmobius.gameserver.network.serverpackets.Earthquake;
import org.l2jmobius.gameserver.network.serverpackets.ExRedSky; import org.l2jmobius.gameserver.network.serverpackets.ExRedSky;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction; import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo; import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
@ -109,26 +107,8 @@ public class CursedWeapon implements INamable
_player.storeMe(); _player.storeMe();
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList(false);
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList(false);
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
else else
@ -170,26 +150,8 @@ public class CursedWeapon implements INamable
if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null)) if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null))
{ {
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList(false);
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList(false);
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
// is dropped on the ground // is dropped on the ground
@ -430,7 +392,6 @@ public class CursedWeapon implements INamable
// Equip with the weapon // Equip with the weapon
_item = item; _item = item;
// Item[] items =
_player.getInventory().equipItem(_item); _player.getInventory().equipItem(_item);
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1); SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1);
sm.addItemName(_item); sm.addItemName(_item);
@ -441,16 +402,7 @@ public class CursedWeapon implements INamable
_player.setCurrentCp(_player.getMaxCp()); _player.setCurrentCp(_player.getMaxCp());
// Refresh inventory // Refresh inventory
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList(false);
{
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_item);
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList(false);
}
// Refresh player stats // Refresh player stats
_player.broadcastUserInfo(); _player.broadcastUserInfo();

58
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/CursedWeapon.java
View File

@ -23,7 +23,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Chronos;
@ -42,7 +41,6 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.Earthquake; import org.l2jmobius.gameserver.network.serverpackets.Earthquake;
import org.l2jmobius.gameserver.network.serverpackets.ExRedSky; import org.l2jmobius.gameserver.network.serverpackets.ExRedSky;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction; import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo; import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
@ -109,26 +107,8 @@ public class CursedWeapon implements INamable
_player.storeMe(); _player.storeMe();
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
else else
@ -170,26 +150,8 @@ public class CursedWeapon implements INamable
if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null)) if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null))
{ {
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
// is dropped on the ground // is dropped on the ground
@ -430,7 +392,6 @@ public class CursedWeapon implements INamable
// Equip with the weapon // Equip with the weapon
_item = item; _item = item;
// Item[] items =
_player.getInventory().equipItem(_item); _player.getInventory().equipItem(_item);
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1); SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1);
sm.addItemName(_item); sm.addItemName(_item);
@ -441,16 +402,7 @@ public class CursedWeapon implements INamable
_player.setCurrentCp(_player.getMaxCp()); _player.setCurrentCp(_player.getMaxCp());
// Refresh inventory // Refresh inventory
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_item);
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
// Refresh player stats // Refresh player stats
_player.broadcastUserInfo(); _player.broadcastUserInfo();

58
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/CursedWeapon.java
View File

@ -23,7 +23,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Chronos;
@ -42,7 +41,6 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.Earthquake; import org.l2jmobius.gameserver.network.serverpackets.Earthquake;
import org.l2jmobius.gameserver.network.serverpackets.ExRedSky; import org.l2jmobius.gameserver.network.serverpackets.ExRedSky;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction; import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo; import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
@ -109,26 +107,8 @@ public class CursedWeapon implements INamable
_player.storeMe(); _player.storeMe();
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
else else
@ -170,26 +150,8 @@ public class CursedWeapon implements INamable
if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null)) if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null))
{ {
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
// is dropped on the ground // is dropped on the ground
@ -430,7 +392,6 @@ public class CursedWeapon implements INamable
// Equip with the weapon // Equip with the weapon
_item = item; _item = item;
// Item[] items =
_player.getInventory().equipItem(_item); _player.getInventory().equipItem(_item);
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1); SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1);
sm.addItemName(_item); sm.addItemName(_item);
@ -441,16 +402,7 @@ public class CursedWeapon implements INamable
_player.setCurrentCp(_player.getMaxCp()); _player.setCurrentCp(_player.getMaxCp());
// Refresh inventory // Refresh inventory
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_item);
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
// Refresh player stats // Refresh player stats
_player.broadcastUserInfo(); _player.broadcastUserInfo();

58
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/CursedWeapon.java
View File

@ -23,7 +23,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Chronos;
@ -42,7 +41,6 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.Earthquake; import org.l2jmobius.gameserver.network.serverpackets.Earthquake;
import org.l2jmobius.gameserver.network.serverpackets.ExRedSky; import org.l2jmobius.gameserver.network.serverpackets.ExRedSky;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction; import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo; import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
@ -109,26 +107,8 @@ public class CursedWeapon implements INamable
_player.storeMe(); _player.storeMe();
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
else else
@ -170,26 +150,8 @@ public class CursedWeapon implements INamable
if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null)) if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null))
{ {
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
// is dropped on the ground // is dropped on the ground
@ -430,7 +392,6 @@ public class CursedWeapon implements INamable
// Equip with the weapon // Equip with the weapon
_item = item; _item = item;
// Item[] items =
_player.getInventory().equipItem(_item); _player.getInventory().equipItem(_item);
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1); SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1);
sm.addItemName(_item); sm.addItemName(_item);
@ -441,16 +402,7 @@ public class CursedWeapon implements INamable
_player.setCurrentCp(_player.getMaxCp()); _player.setCurrentCp(_player.getMaxCp());
// Refresh inventory // Refresh inventory
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_item);
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
// Refresh player stats // Refresh player stats
_player.broadcastUserInfo(); _player.broadcastUserInfo();

58
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/CursedWeapon.java
View File

@ -23,7 +23,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Chronos;
@ -42,7 +41,6 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.Earthquake; import org.l2jmobius.gameserver.network.serverpackets.Earthquake;
import org.l2jmobius.gameserver.network.serverpackets.ExRedSky; import org.l2jmobius.gameserver.network.serverpackets.ExRedSky;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction; import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo; import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
@ -109,26 +107,8 @@ public class CursedWeapon implements INamable
_player.storeMe(); _player.storeMe();
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
else else
@ -170,26 +150,8 @@ public class CursedWeapon implements INamable
if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null)) if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null))
{ {
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
// is dropped on the ground // is dropped on the ground
@ -430,7 +392,6 @@ public class CursedWeapon implements INamable
// Equip with the weapon // Equip with the weapon
_item = item; _item = item;
// Item[] items =
_player.getInventory().equipItem(_item); _player.getInventory().equipItem(_item);
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1); SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1);
sm.addItemName(_item); sm.addItemName(_item);
@ -441,16 +402,7 @@ public class CursedWeapon implements INamable
_player.setCurrentCp(_player.getMaxCp()); _player.setCurrentCp(_player.getMaxCp());
// Refresh inventory // Refresh inventory
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_item);
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
// Refresh player stats // Refresh player stats
_player.broadcastUserInfo(); _player.broadcastUserInfo();

58
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/CursedWeapon.java
View File

@ -23,7 +23,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Chronos;
@ -42,7 +41,6 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.Earthquake; import org.l2jmobius.gameserver.network.serverpackets.Earthquake;
import org.l2jmobius.gameserver.network.serverpackets.ExRedSky; import org.l2jmobius.gameserver.network.serverpackets.ExRedSky;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction; import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo; import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
@ -109,26 +107,8 @@ public class CursedWeapon implements INamable
_player.storeMe(); _player.storeMe();
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList(false);
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList(false);
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
else else
@ -170,26 +150,8 @@ public class CursedWeapon implements INamable
if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null)) if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null))
{ {
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList(false);
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList(false);
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
// is dropped on the ground // is dropped on the ground
@ -430,7 +392,6 @@ public class CursedWeapon implements INamable
// Equip with the weapon // Equip with the weapon
_item = item; _item = item;
// Item[] items =
_player.getInventory().equipItem(_item); _player.getInventory().equipItem(_item);
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1); SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1);
sm.addItemName(_item); sm.addItemName(_item);
@ -441,16 +402,7 @@ public class CursedWeapon implements INamable
_player.setCurrentCp(_player.getMaxCp()); _player.setCurrentCp(_player.getMaxCp());
// Refresh inventory // Refresh inventory
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList(false);
{
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_item);
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList(false);
}
// Refresh player stats // Refresh player stats
_player.broadcastUserInfo(); _player.broadcastUserInfo();

58
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/CursedWeapon.java
View File

@ -23,7 +23,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Chronos;
@ -42,7 +41,6 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.Earthquake; import org.l2jmobius.gameserver.network.serverpackets.Earthquake;
import org.l2jmobius.gameserver.network.serverpackets.ExRedSky; import org.l2jmobius.gameserver.network.serverpackets.ExRedSky;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction; import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo; import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
@ -109,26 +107,8 @@ public class CursedWeapon implements INamable
_player.storeMe(); _player.storeMe();
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
else else
@ -170,26 +150,8 @@ public class CursedWeapon implements INamable
if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null)) if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null))
{ {
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
// is dropped on the ground // is dropped on the ground
@ -430,7 +392,6 @@ public class CursedWeapon implements INamable
// Equip with the weapon // Equip with the weapon
_item = item; _item = item;
// Item[] items =
_player.getInventory().equipItem(_item); _player.getInventory().equipItem(_item);
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1); SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1);
sm.addItemName(_item); sm.addItemName(_item);
@ -441,16 +402,7 @@ public class CursedWeapon implements INamable
_player.setCurrentCp(_player.getMaxCp()); _player.setCurrentCp(_player.getMaxCp());
// Refresh inventory // Refresh inventory
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_item);
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
// Refresh player stats // Refresh player stats
_player.broadcastUserInfo(); _player.broadcastUserInfo();

58
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/CursedWeapon.java
View File

@ -23,7 +23,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Chronos;
@ -42,7 +41,6 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.Earthquake; import org.l2jmobius.gameserver.network.serverpackets.Earthquake;
import org.l2jmobius.gameserver.network.serverpackets.ExRedSky; import org.l2jmobius.gameserver.network.serverpackets.ExRedSky;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction; import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo; import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
@ -109,26 +107,8 @@ public class CursedWeapon implements INamable
_player.storeMe(); _player.storeMe();
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
else else
@ -170,26 +150,8 @@ public class CursedWeapon implements INamable
if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null)) if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null))
{ {
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
// is dropped on the ground // is dropped on the ground
@ -430,7 +392,6 @@ public class CursedWeapon implements INamable
// Equip with the weapon // Equip with the weapon
_item = item; _item = item;
// Item[] items =
_player.getInventory().equipItem(_item); _player.getInventory().equipItem(_item);
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1); SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1);
sm.addItemName(_item); sm.addItemName(_item);
@ -441,16 +402,7 @@ public class CursedWeapon implements INamable
_player.setCurrentCp(_player.getMaxCp()); _player.setCurrentCp(_player.getMaxCp());
// Refresh inventory // Refresh inventory
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_item);
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
// Refresh player stats // Refresh player stats
_player.broadcastUserInfo(); _player.broadcastUserInfo();

58
L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/CursedWeapon.java
View File

@ -23,7 +23,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Chronos;
@ -42,7 +41,6 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.Earthquake; import org.l2jmobius.gameserver.network.serverpackets.Earthquake;
import org.l2jmobius.gameserver.network.serverpackets.ExRedSky; import org.l2jmobius.gameserver.network.serverpackets.ExRedSky;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction; import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo; import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
@ -109,26 +107,8 @@ public class CursedWeapon implements INamable
_player.storeMe(); _player.storeMe();
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
else else
@ -170,26 +150,8 @@ public class CursedWeapon implements INamable
if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null)) if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null))
{ {
// Destroy // Destroy
final Item removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
if (removedItem.getCount() == 0)
{
iu.addRemovedItem(removedItem);
}
else
{
iu.addModifiedItem(removedItem);
}
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
_player.broadcastUserInfo(); _player.broadcastUserInfo();
} }
// is dropped on the ground // is dropped on the ground
@ -430,7 +392,6 @@ public class CursedWeapon implements INamable
// Equip with the weapon // Equip with the weapon
_item = item; _item = item;
// Item[] items =
_player.getInventory().equipItem(_item); _player.getInventory().equipItem(_item);
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_S1); SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_S1);
sm.addItemName(_item); sm.addItemName(_item);
@ -441,16 +402,7 @@ public class CursedWeapon implements INamable
_player.setCurrentCp(_player.getMaxCp()); _player.setCurrentCp(_player.getMaxCp());
// Refresh inventory // Refresh inventory
if (!Config.FORCE_INVENTORY_UPDATE) _player.sendItemList();
{
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(_item);
_player.sendInventoryUpdate(iu);
}
else
{
_player.sendItemList();
}
// Refresh player stats // Refresh player stats
_player.broadcastUserInfo(); _player.broadcastUserInfo();