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

Removed pointless assignments before packet send.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-01-30 23:02:45 +00:00
parent 5cd563c611
commit 845dea2551
505 changed files with 842 additions and 1792 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/AdminCommands.java
View File

@@ -428,8 +428,7 @@ public class AdminCommands extends Thread
final TradeList list = TradeController.getInstance().getBuyList(val);
if (list != null)
{
final BuyList bl = new BuyList(list, player.getAdena());
player.sendPacket(bl);
player.sendPacket(new BuyList(list, player.getAdena()));
}
else
{
@@ -489,8 +488,7 @@ public class AdminCommands extends Thread
{
activeChar.getInventory().addItem(createditem);
}
final ItemList il = new ItemList(activeChar, true);
activeChar.sendPacket(il);
activeChar.sendPacket(new ItemList(activeChar, true));
activeChar.sendMessage("You have spawned " + num + " item(s) number " + id + " in your inventory.");
final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
final StringBuilder replyMSG = new StringBuilder("<html><title>Item Creation Complete</title>");
@@ -762,8 +760,7 @@ public class AdminCommands extends Thread
else
{
activeChar.sendMessage("Character " + player.getName() + " disconnected from server.");
final LeaveWorld ql = new LeaveWorld();
player.sendPacket(ql);
player.sendPacket(new LeaveWorld());
try
{
player.getNetConnection().close();

3
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/Announcements.java
View File

@@ -71,8 +71,7 @@ public class Announcements
{
for (int i = 0; i < _announcements.size(); ++i)
{
final CreatureSay cs = new CreatureSay(0, 10, activeChar.getName(), _announcements.get(i));
activeChar.sendPacket(cs);
activeChar.sendPacket(new CreatureSay(0, 10, activeChar.getName(), _announcements.get(i)));
}
}

9
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/handler/itemhandlers/PetSummon.java
View File

@@ -103,12 +103,9 @@ public class PetSummon implements IItemHandler
newpet.setRunning(true);
World.getInstance().storeObject(newpet);
World.getInstance().addVisibleObject(newpet);
final MagicSkillUser msk = new MagicSkillUser(activeChar, 2046, 1, 1000, 600000);
activeChar.sendPacket(msk);
final PetInfo ownerni = new PetInfo(newpet);
final NpcInfo ni = new NpcInfo(newpet);
activeChar.broadcastPacket(ni);
activeChar.sendPacket(ownerni);
activeChar.sendPacket(new MagicSkillUser(activeChar, 2046, 1, 1000, 600000));
activeChar.broadcastPacket(new NpcInfo(newpet));
activeChar.sendPacket(new PetInfo(newpet));
activeChar.sendPacket(new PetItemList(newpet));
ThreadPool.schedule(() ->

3
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/managers/CommunityBoardManager.java
View File

@@ -195,8 +195,7 @@ public class CommunityBoardManager
}
}
htmlCode.append("</td></tr></table></body></html>");
final ShowBoard sb = new ShowBoard(activeChar, htmlCode.toString());
activeChar.sendPacket(sb);
activeChar.sendPacket(new ShowBoard(activeChar, htmlCode.toString()));
}
}
}

12
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Party.java
View File

@@ -170,12 +170,11 @@ public class Party
private void dissolveParty()
{
final SystemMessage msg = new SystemMessage(SystemMessage.PARTY_DISPERSED);
for (int i = 0; i < _members.size(); ++i)
for (PlayerInstance member : _members)
{
final PlayerInstance temp = _members.get(i);
temp.sendPacket(msg);
temp.sendPacket(new PartySmallWindowDeleteAll());
temp.setParty(null);
member.sendPacket(msg);
member.sendPacket(new PartySmallWindowDeleteAll());
member.setParty(null);
}
}
@@ -217,8 +216,7 @@ public class Party
iu.addModifiedItem(item2);
}
target.sendPacket(iu);
final UserInfo ci = new UserInfo(target);
target.sendPacket(ci);
target.sendPacket(new UserInfo(target));
}
public void distributeAdena(ItemInstance adena)

3
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java
View File

@@ -272,8 +272,7 @@ public class Attackable extends NpcInstance
dropit.setY(getY());
dropit.setZ(getZ() + 100);
dropit.setOnTheGround(true);
final DropItem dis = new DropItem(dropit, getObjectId());
for (PlayerInstance player : broadcastPacket(dis))
for (PlayerInstance player : broadcastPacket(new DropItem(dropit, getObjectId())))
{
player.addKnownObjectWithoutCreate(dropit);
}

21
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@@ -1051,8 +1051,7 @@ public abstract class Creature extends WorldObject
setto = new SetToLocation(this);
broadcastPacket(setto);
}
final FinishRotation fr = new FinishRotation(this);
broadcastPacket(fr);
broadcastPacket(new FinishRotation(this));
}
public boolean isDead()
@@ -1080,16 +1079,14 @@ public abstract class Creature extends WorldObject
{
setInCombat(false);
setCurrentState(CreatureState.IDLE);
final ActionFailed af = new ActionFailed();
sendPacket(af);
sendPacket(new ActionFailed());
return;
}
if ((getActiveWeapon().getWeaponType() == Weapon.WEAPON_TYPE_BOW) && !checkAndEquipArrows())
{
setInCombat(false);
setCurrentState(CreatureState.IDLE);
final ActionFailed af = new ActionFailed();
sendPacket(af);
sendPacket(new ActionFailed());
sendPacket(new SystemMessage(SystemMessage.NOT_ENOUGH_ARROWS));
return;
}
@@ -1106,8 +1103,7 @@ public abstract class Creature extends WorldObject
{
setInCombat(false);
setCurrentState(CreatureState.IDLE);
final ActionFailed af = new ActionFailed();
sendPacket(af);
sendPacket(new ActionFailed());
return;
}
if (!_currentlyAttacking)
@@ -1164,8 +1160,7 @@ public abstract class Creature extends WorldObject
sendPacket(new SystemMessage(SystemMessage.NOT_ENOUGH_MP));
setInCombat(false);
setCurrentState(CreatureState.IDLE);
final ActionFailed af = new ActionFailed();
sendPacket(af);
sendPacket(new ActionFailed());
return;
}
reduceCurrentMp(weaponItem.getMpConsume());
@@ -1203,8 +1198,7 @@ public abstract class Creature extends WorldObject
setInCombat(false);
setTarget(null);
setCurrentState(CreatureState.IDLE);
final ActionFailed af = new ActionFailed();
sendPacket(af);
sendPacket(new ActionFailed());
return;
}
if (_currentlyAttacking)
@@ -1282,8 +1276,7 @@ public abstract class Creature extends WorldObject
{
setInCombat(false);
setCurrentState(CreatureState.IDLE);
final ActionFailed af = new ActionFailed();
sendPacket(af);
sendPacket(new ActionFailed());
return;
}
setTarget(target);

9
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/ClassMasterInstance.java
View File

@@ -40,8 +40,7 @@ public class ClassMasterInstance extends NpcInstance
{
player.setCurrentState(CreatureState.IDLE);
player.setTarget(this);
final MyTargetSelected my = new MyTargetSelected(getObjectId(), player.getLevel() - getLevel());
player.sendPacket(my);
player.sendPacket(new MyTargetSelected(getObjectId(), player.getLevel() - getLevel()));
player.sendPacket(new SetToLocation(this));
}
else
@@ -144,9 +143,7 @@ public class ClassMasterInstance extends NpcInstance
private void changeClass(PlayerInstance player, int value)
{
player.setClassId(value);
final UserInfo ui = new UserInfo(player);
player.sendPacket(ui);
final CharInfo info = new CharInfo(player);
player.broadcastPacket(info);
player.sendPacket(new UserInfo(player));
player.broadcastPacket(new CharInfo(player));
}
}

3
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
View File

@@ -105,8 +105,7 @@ public class GuardInstance extends Attackable
{
player.setCurrentState(CreatureState.IDLE);
player.setTarget(this);
final MyTargetSelected my = new MyTargetSelected(getObjectId(), 0);
player.sendPacket(my);
player.sendPacket(new MyTargetSelected(getObjectId(), 0));
player.sendPacket(new SetToLocation(this));
}
else if (containsTarget(player))

6
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java
View File

@@ -75,8 +75,7 @@ public class NpcInstance extends Creature
if (!isRunning())
{
setRunning(true);
final ChangeMoveType move = new ChangeMoveType(this, ChangeMoveType.RUN);
broadcastPacket(move);
broadcastPacket(new ChangeMoveType(this, ChangeMoveType.RUN));
}
super.startAttack(target);
}
@@ -132,8 +131,7 @@ public class NpcInstance extends Creature
}
player.setCurrentState(CreatureState.IDLE);
player.setTarget(this);
final MyTargetSelected my = new MyTargetSelected(getObjectId(), player.getLevel() - getLevel());
player.sendPacket(my);
player.sendPacket(new MyTargetSelected(getObjectId(), player.getLevel() - getLevel()));
if (isAutoAttackable())
{
final StatusUpdate su = new StatusUpdate(getObjectId());

33
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
View File

@@ -91,8 +91,7 @@ public class PetInstance extends Creature
}
player.setCurrentState(CreatureState.IDLE);
player.setTarget(this);
final MyTargetSelected my = new MyTargetSelected(getObjectId(), player.getLevel() - getLevel());
player.sendPacket(my);
player.sendPacket(new MyTargetSelected(getObjectId(), player.getLevel() - getLevel()));
}
public void setSummonHp(int hp)
@@ -277,8 +276,7 @@ public class PetInstance extends Creature
final StatusUpdate su = new StatusUpdate(getObjectId());
su.addAttribute(StatusUpdate.LEVEL, getLevel());
broadcastPacket(su);
final SocialAction sa = new SocialAction(getObjectId(), 15);
broadcastPacket(sa);
broadcastPacket(new SocialAction(getObjectId(), 15));
_owner.sendPacket(new SystemMessage(SystemMessage.YOU_INCREASED_YOUR_LEVEL));
}
@@ -343,8 +341,7 @@ public class PetInstance extends Creature
private void doPickupItem()
{
final StopMove sm = new StopMove(getObjectId(), getX(), getY(), getZ(), getHeading());
broadcastPacket(sm);
broadcastPacket(new StopMove(getObjectId(), getX(), getY(), getZ(), getHeading()));
if (!(getTarget() instanceof ItemInstance))
{
_log.warning("trying to pickup wrong target." + getTarget());
@@ -367,14 +364,11 @@ public class PetInstance extends Creature
setCurrentState(CreatureState.IDLE);
return;
}
final GetItem gi = new GetItem(target, getObjectId());
broadcastPacket(gi);
broadcastPacket(new GetItem(target, getObjectId()));
World.getInstance().removeVisibleObject(target);
final DeleteObject del = new DeleteObject(target);
broadcastPacket(del);
broadcastPacket(new DeleteObject(target));
getInventory().addItem(target);
final PetItemList iu = new PetItemList(this);
_owner.sendPacket(iu);
_owner.sendPacket(new PetItemList(this));
setCurrentState(CreatureState.IDLE);
if (getFollowStatus())
{
@@ -436,10 +430,9 @@ public class PetInstance extends Creature
_owner.getInventory().addItem(item);
getInventory().dropItem(item, item.getCount());
final PetInventoryUpdate petiu = new PetInventoryUpdate();
final ItemList playerUI = new ItemList(_owner, false);
petiu.addRemovedItem(item);
_owner.sendPacket(petiu);
_owner.sendPacket(playerUI);
_owner.sendPacket(new ItemList(_owner, false));
}
catch (Exception e)
{
@@ -484,10 +477,8 @@ public class PetInstance extends Creature
final StatusUpdate su = new StatusUpdate(owner.getObjectId());
su.addAttribute(StatusUpdate.CUR_LOAD, owner.getCurrentLoad());
owner.sendPacket(su);
final UserInfo ui = new UserInfo(owner);
owner.sendPacket(ui);
final CharInfo info = new CharInfo(owner);
owner.broadcastPacket(info);
owner.sendPacket(new UserInfo(owner));
owner.broadcastPacket(new CharInfo(owner));
final World world = World.getInstance();
world.removeObject(removedItem);
}
@@ -521,8 +512,7 @@ public class PetInstance extends Creature
dropit.setY(getY());
dropit.setZ(getZ() + 100);
dropit.setOnTheGround(true);
final DropItem dis = new DropItem(dropit, getObjectId());
for (PlayerInstance player : broadcastPacket(dis))
for (PlayerInstance player : broadcastPacket(new DropItem(dropit, getObjectId())))
{
player.addKnownObjectWithoutCreate(dropit);
}
@@ -541,8 +531,7 @@ public class PetInstance extends Creature
if (!isRunning())
{
setRunning(true);
final ChangeMoveType move = new ChangeMoveType(this, ChangeMoveType.RUN);
broadcastPacket(move);
broadcastPacket(new ChangeMoveType(this, ChangeMoveType.RUN));
}
super.startAttack(target);
}

27
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@@ -580,8 +580,7 @@ public class PlayerInstance extends Creature
if (player.getTarget() != this)
{
player.setTarget(this);
final MyTargetSelected my = new MyTargetSelected(getObjectId(), 0);
player.sendPacket(my);
player.sendPacket(new MyTargetSelected(getObjectId(), 0));
}
else
{
@@ -607,8 +606,7 @@ public class PlayerInstance extends Creature
}
if (isInParty())
{
final PartySmallWindowUpdate update = new PartySmallWindowUpdate(this);
getParty().broadcastToPartyMembers(this, update);
getParty().broadcastToPartyMembers(this, new PartySmallWindowUpdate(this));
}
}
@@ -762,8 +760,7 @@ public class PlayerInstance extends Creature
}
final ItemInstance target = (ItemInstance) getTarget();
sendPacket(new ActionFailed());
final StopMove sm = new StopMove(getObjectId(), getX(), getY(), getZ(), getHeading());
sendPacket(sm);
sendPacket(new StopMove(getObjectId(), getX(), getY(), getZ(), getHeading()));
boolean pickupOk = false;
synchronized (target)
{
@@ -811,8 +808,7 @@ public class PlayerInstance extends Creature
iu.addModifiedItem(target2);
}
sendPacket(iu);
final UserInfo ci = new UserInfo(this);
sendPacket(ci);
sendPacket(new UserInfo(this));
}
else if (target.getItemId() == 57)
{
@@ -1098,8 +1094,7 @@ public class PlayerInstance extends Creature
super.addKnownObject(object);
if (object instanceof ItemInstance)
{
final SpawnItem si = new SpawnItem((ItemInstance) object);
sendPacket(si);
sendPacket(new SpawnItem((ItemInstance) object));
}
else if (object instanceof NpcInstance)
{
@@ -1127,13 +1122,11 @@ public class PlayerInstance extends Creature
final Creature obj = (Creature) object;
if (obj.isMoving())
{
final CharMoveToLocation mov = new CharMoveToLocation(obj);
sendPacket(mov);
sendPacket(new CharMoveToLocation(obj));
}
else if (obj.isMovingToPawn())
{
final MoveToPawn mov = new MoveToPawn(obj, obj.getPawnTarget(), obj.getPawnOffset());
sendPacket(mov);
sendPacket(new MoveToPawn(obj, obj.getPawnTarget(), obj.getPawnOffset()));
}
}
}
@@ -1536,8 +1529,7 @@ public class PlayerInstance extends Creature
}
final int magicId = skill.getId();
final int level = getSkillLevel(magicId);
final ActionFailed af = new ActionFailed();
sendPacket(af);
sendPacket(new ActionFailed());
final MagicSkillUser msu = new MagicSkillUser(this, target, magicId, level, skill.getHitTime(), skill.getReuseDelay());
sendPacket(msu);
broadcastPacket(msu);
@@ -1637,8 +1629,7 @@ public class PlayerInstance extends Creature
if (_arrowItem != null)
{
getInventory().setPaperdollItem(8, _arrowItem);
final ItemList il = new ItemList(this, false);
sendPacket(il);
sendPacket(new ItemList(this, false));
}
}
else

3
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java
View File

@@ -65,8 +65,7 @@ public class TeleporterInstance extends NpcInstance
}
else
{
final SystemMessage sm = new SystemMessage(SystemMessage.YOU_NOT_ENOUGH_ADENA);
player.sendPacket(sm);
player.sendPacket(new SystemMessage(SystemMessage.YOU_NOT_ENOUGH_ADENA));
}
}
else

21
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
View File

@@ -54,37 +54,30 @@ public class VillageMasterInstance extends NpcInstance
{
if (player.getLevel() < 10)
{
final SystemMessage sm = new SystemMessage(SystemMessage.FAILED_TO_CREATE_CLAN);
player.sendPacket(sm);
player.sendPacket(new SystemMessage(SystemMessage.FAILED_TO_CREATE_CLAN));
return;
}
if (player.getClanId() != 0)
{
final SystemMessage sm = new SystemMessage(SystemMessage.FAILED_TO_CREATE_CLAN);
player.sendPacket(sm);
player.sendPacket(new SystemMessage(SystemMessage.FAILED_TO_CREATE_CLAN));
return;
}
if (clanName.length() > 16)
{
final SystemMessage sm = new SystemMessage(SystemMessage.CLAN_NAME_TOO_LONG);
player.sendPacket(sm);
player.sendPacket(new SystemMessage(SystemMessage.CLAN_NAME_TOO_LONG));
return;
}
final Clan clan = ClanTable.getInstance().createClan(player, clanName);
if (clan == null)
{
final SystemMessage sm = new SystemMessage(SystemMessage.CLAN_NAME_INCORRECT);
player.sendPacket(sm);
player.sendPacket(new SystemMessage(SystemMessage.CLAN_NAME_INCORRECT));
return;
}
player.setClan(clan);
player.setClanId(clan.getClanId());
player.setClanLeader(true);
final PledgeShowInfoUpdate pu = new PledgeShowInfoUpdate(clan, player);
player.sendPacket(pu);
final UserInfo ui = new UserInfo(player);
player.sendPacket(ui);
final SystemMessage sm = new SystemMessage(SystemMessage.CLAN_CREATED);
player.sendPacket(sm);
player.sendPacket(new PledgeShowInfoUpdate(clan, player));
player.sendPacket(new UserInfo(player));
player.sendPacket(new SystemMessage(SystemMessage.CLAN_CREATED));
}
}

6
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/WarehouseInstance.java
View File

@@ -48,8 +48,7 @@ public class WarehouseInstance extends NpcInstance
final Warehouse list = player.getWarehouse();
if (list != null)
{
final WareHouseWithdrawalList wl = new WareHouseWithdrawalList(player);
player.sendPacket(wl);
player.sendPacket(new WareHouseWithdrawalList(player));
}
else
{
@@ -60,8 +59,7 @@ public class WarehouseInstance extends NpcInstance
private void showDepositWindow(PlayerInstance player)
{
final WareHouseDepositList dl = new WareHouseDepositList(player);
player.sendPacket(dl);
player.sendPacket(new WareHouseDepositList(player));
player.sendPacket(new ActionFailed());
}

3
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java
View File

@@ -87,8 +87,7 @@ public class AddTradeItem extends ClientBasePacket
else
{
player.sendPacket(new SendTradeDone(0));
final SystemMessage msg = new SystemMessage(SystemMessage.TARGET_IS_NOT_FOUND_IN_THE_GAME);
player.sendPacket(msg);
player.sendPacket(new SystemMessage(SystemMessage.TARGET_IS_NOT_FOUND_IN_THE_GAME));
player.setTransactionRequester(null);
requestor.getTradeList().getItems().clear();
player.getTradeList().getItems().clear();

3
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
View File

@@ -65,8 +65,7 @@ public class AnswerTradeRequest extends ClientBasePacket
else if (response != 0)
{
player.sendPacket(new SendTradeDone(0));
final SystemMessage msg = new SystemMessage(SystemMessage.TARGET_IS_NOT_FOUND_IN_THE_GAME);
player.sendPacket(msg);
player.sendPacket(new SystemMessage(SystemMessage.TARGET_IS_NOT_FOUND_IN_THE_GAME));
player.setTransactionRequester(null);
}
}

3
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java
View File

@@ -55,8 +55,7 @@ public class AuthLogin extends ClientBasePacket
else
{
LoginController.getInstance().addGameServerLogin(loginName, client.getConnection());
final CharSelectInfo cl = new CharSelectInfo(loginName, client.getSessionId());
client.getConnection().sendPacket(cl);
client.getConnection().sendPacket(new CharSelectInfo(loginName, client.getSessionId()));
}
client.setAccessLevel(access);
}

12
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java
View File

@@ -57,20 +57,17 @@ public class CharacterCreate extends ClientBasePacket
if (CharNameTable.getInstance().doesCharNameExist(newChar.getName()))
{
final CharCreateFail ccf = new CharCreateFail(CharCreateFail.REASON_NAME_ALREADY_EXISTS);
client.getConnection().sendPacket(ccf);
client.getConnection().sendPacket(new CharCreateFail(CharCreateFail.REASON_NAME_ALREADY_EXISTS));
}
else if ((newChar.getName().length() <= 16) && isAlphaNumeric(newChar.getName()))
{
final CharCreateOk cco = new CharCreateOk();
client.getConnection().sendPacket(cco);
client.getConnection().sendPacket(new CharCreateOk());
initNewChar(client, newChar);
CharNameTable.getInstance().addCharName(newChar.getName());
}
else
{
final CharCreateFail ccf = new CharCreateFail(CharCreateFail.REASON_16_ENG_CHARS);
client.getConnection().sendPacket(ccf);
client.getConnection().sendPacket(new CharCreateFail(CharCreateFail.REASON_16_ENG_CHARS));
}
}
@@ -155,7 +152,6 @@ public class CharacterCreate extends ClientBasePacket
newChar.addSkill(SkillTable.getInstance().getInfo(startSkill.getId(), startSkill.getLevel()));
}
client.saveCharToDisk(newChar);
final CharSelectInfo cl = new CharSelectInfo(client.getLoginName(), client.getSessionId());
client.getConnection().sendPacket(cl);
client.getConnection().sendPacket(new CharSelectInfo(client.getLoginName(), client.getSessionId()));
}
}

6
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java
View File

@@ -32,9 +32,7 @@ public class CharacterDelete extends ClientBasePacket
final int charSlot = readD();
final Connection con = client.getConnection();
client.deleteCharFromDisk(charSlot);
final CharDeleteOk ccf = new CharDeleteOk();
con.sendPacket(ccf);
final CharSelectInfo cl = new CharSelectInfo(client.getLoginName(), client.getSessionId());
con.sendPacket(cl);
con.sendPacket(new CharDeleteOk());
con.sendPacket(new CharSelectInfo(client.getLoginName(), client.getSessionId()));
}
}

3
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterRestore.java
View File

@@ -29,7 +29,6 @@ public class CharacterRestore extends ClientBasePacket
super(decrypt);
@SuppressWarnings("unused")
final int charSlot = readD();
final CharSelectInfo cl = new CharSelectInfo(client.getLoginName(), client.getSessionId());
client.getConnection().sendPacket(cl);
client.getConnection().sendPacket(new CharSelectInfo(client.getLoginName(), client.getSessionId()));
}
}

3
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelected.java
View File

@@ -32,8 +32,7 @@ public class CharacterSelected extends ClientBasePacket
final PlayerInstance cha = client.loadCharFromDisk(charSlot);
cha.setMoveType(1);
cha.setWaitType(1);
final CharSelected cs = new CharSelected(cha, client.getSessionId());
client.getConnection().sendPacket(cs);
client.getConnection().sendPacket(new CharSelected(cha, client.getSessionId()));
client.setActiveChar(cha);
}
}

3
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@@ -50,8 +50,7 @@ public class EnterWorld extends ClientBasePacket
activeChar.sendPacket(new SystemMessage(SystemMessage.WELCOME_TO_LINEAGE));
Announcements.getInstance().showAnnouncements(activeChar);
final ItemList il = new ItemList(activeChar, false);
activeChar.sendPacket(il);
activeChar.sendPacket(new ItemList(activeChar, false));
final ShortCutInit sci = new ShortCutInit();
for (ShortCut shortcut : activeChar.getAllShortCuts())

6
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinParty.java
View File

@@ -30,16 +30,14 @@ public class RequestAnswerJoinParty extends ClientBasePacket
final int response = readD();
final PlayerInstance player = client.getActiveChar();
final PlayerInstance requestor = player.getTransactionRequester();
final JoinParty join = new JoinParty(response);
requestor.sendPacket(join);
requestor.sendPacket(new JoinParty(response));
if (response == 1)
{
player.joinParty(requestor.getParty());
}
else
{
final SystemMessage msg = new SystemMessage(SystemMessage.PLAYER_DECLINED);
requestor.sendPacket(msg);
requestor.sendPacket(new SystemMessage(SystemMessage.PLAYER_DECLINED));
if (requestor.getParty().getMemberCount() == 1)
{
requestor.setParty(null);

9
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
View File

@@ -39,24 +39,21 @@ public class RequestAnswerJoinPledge extends ClientBasePacket
final PlayerInstance requestor = activeChar.getTransactionRequester();
if (answer == 1)
{
final JoinPledge jp = new JoinPledge(requestor.getClanId());
activeChar.sendPacket(jp);
activeChar.sendPacket(new JoinPledge(requestor.getClanId()));
final Clan clan = requestor.getClan();
clan.addClanMember(activeChar);
clan.store();
activeChar.setClanId(clan.getClanId());
activeChar.setClan(clan);
final PledgeShowInfoUpdate pu = new PledgeShowInfoUpdate(clan, activeChar);
activeChar.sendPacket(pu);
activeChar.sendPacket(new PledgeShowInfoUpdate(clan, activeChar));
activeChar.sendPacket(new UserInfo(activeChar));
activeChar.broadcastPacket(new CharInfo(activeChar));
SystemMessage sm = new SystemMessage(SystemMessage.ENTERED_THE_CLAN);
activeChar.sendPacket(sm);
// ClanMember[] members = clan.getMembers();
final PledgeShowMemberListAdd la = new PledgeShowMemberListAdd(activeChar);
sm = new SystemMessage(SystemMessage.S1_HAS_JOINED_CLAN);
sm.addString(activeChar.getName());
clan.broadcastToOnlineMembers(la);
clan.broadcastToOnlineMembers(new PledgeShowMemberListAdd(activeChar));
clan.broadcastToOnlineMembers(sm);
activeChar.sendPacket(new PledgeShowMemberListAll(clan, activeChar));
}

6
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
View File

@@ -71,10 +71,8 @@ public class RequestDestroyItem extends ClientBasePacket
final StatusUpdate su = new StatusUpdate(activeChar.getObjectId());
su.addAttribute(StatusUpdate.CUR_LOAD, activeChar.getCurrentLoad());
activeChar.sendPacket(su);
final UserInfo ui = new UserInfo(activeChar);
activeChar.sendPacket(ui);
final CharInfo info = new CharInfo(activeChar);
activeChar.broadcastPacket(info);
activeChar.sendPacket(new UserInfo(activeChar));
activeChar.broadcastPacket(new CharInfo(activeChar));
final World world = World.getInstance();
world.removeObject(removedItem);
}

6
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java
View File

@@ -63,8 +63,7 @@ public class RequestDropItem extends ClientBasePacket
}
if ((activeChar.getDistance(x, y) > 150.0) || (Math.abs(z - activeChar.getZ()) > 50))
{
final SystemMessage sm = new SystemMessage(SystemMessage.CANNOT_DISCARD_DISTANCE_TOO_FAR);
activeChar.sendPacket(sm);
activeChar.sendPacket(new SystemMessage(SystemMessage.CANNOT_DISCARD_DISTANCE_TOO_FAR));
return;
}
if (oldItem.isEquipped())
@@ -108,8 +107,7 @@ public class RequestDropItem extends ClientBasePacket
}
else
{
final SystemMessage msg = new SystemMessage(SystemMessage.NOTHING_HAPPENED);
activeChar.sendPacket(msg);
activeChar.sendPacket(new SystemMessage(SystemMessage.NOTHING_HAPPENED));
}
}
}

6
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java
View File

@@ -51,8 +51,7 @@ public class RequestGetItemFromPet extends ClientBasePacket
final PetInventoryUpdate petiu = new PetInventoryUpdate();
petiu.addRemovedItem(petItem);
client.getActiveChar().sendPacket(petiu);
final ItemList playerUI = new ItemList(client.getActiveChar(), false);
client.getActiveChar().sendPacket(playerUI);
client.getActiveChar().sendPacket(new ItemList(client.getActiveChar(), false));
}
else
{
@@ -61,9 +60,8 @@ public class RequestGetItemFromPet extends ClientBasePacket
final PetInventoryUpdate petiu = new PetInventoryUpdate();
petiu.addModifiedItem(petItem);
playerInventory.addItem(newPlayerItem);
final ItemList playerUI = new ItemList(client.getActiveChar(), false);
client.getActiveChar().sendPacket(petiu);
client.getActiveChar().sendPacket(playerUI);
client.getActiveChar().sendPacket(new ItemList(client.getActiveChar(), false));
}
}
}

3
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java
View File

@@ -40,8 +40,7 @@ public class RequestGiveItemToPet extends ClientBasePacket
final InventoryUpdate playerUI = new InventoryUpdate();
playerUI.addRemovedItem(playerItem);
client.getActiveChar().sendPacket(playerUI);
final PetItemList petiu = new PetItemList(client.getActiveChar().getPet());
client.getActiveChar().sendPacket(petiu);
client.getActiveChar().sendPacket(new PetItemList(client.getActiveChar().getPet()));
}
else
{

10
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
View File

@@ -38,18 +38,14 @@ public class RequestGiveNickName extends ClientBasePacket
PlayerInstance member;
if (activeChar.getClan().getLevel() < 3)
{
final SystemMessage sm = new SystemMessage(SystemMessage.CLAN_LVL_3_NEEDED_TO_ENDOVE_TITLE);
activeChar.sendPacket(sm);
activeChar.sendPacket(new SystemMessage(SystemMessage.CLAN_LVL_3_NEEDED_TO_ENDOVE_TITLE));
activeChar.sendMessage("But you can do it freely for now ;)");
activeChar.sendPacket(sm);
}
if ((member = World.getInstance().getPlayer(target)).getClanId() == activeChar.getClanId())
{
member.setTitle(title);
final UserInfo ui = new UserInfo(member);
member.sendPacket(ui);
final CharInfo ci = new CharInfo(member);
member.broadcastPacket(ci);
member.sendPacket(new UserInfo(member));
member.broadcastPacket(new CharInfo(member));
}
}
}

12
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java
View File

@@ -39,8 +39,7 @@ public class RequestJoinParty extends ClientBasePacket
final PlayerInstance requestor = client.getActiveChar();
if (requestor.isTransactionInProgress())
{
final SystemMessage msg = new SystemMessage(SystemMessage.WAITING_FOR_REPLY);
requestor.sendPacket(msg);
requestor.sendPacket(new SystemMessage(SystemMessage.WAITING_FOR_REPLY));
return;
}
if (target.isInParty())
@@ -78,16 +77,14 @@ public class RequestJoinParty extends ClientBasePacket
{
target.setTransactionRequester(requestor);
requestor.setTransactionRequester(target);
final AskJoinParty ask = new AskJoinParty(requestor.getObjectId(), itemDistribution);
target.sendPacket(ask);
target.sendPacket(new AskJoinParty(requestor.getObjectId(), itemDistribution));
final SystemMessage msg = new SystemMessage(SystemMessage.YOU_INVITED_S1_TO_PARTY);
msg.addString(target.getName());
requestor.sendPacket(msg);
}
else
{
final SystemMessage msg = new SystemMessage(SystemMessage.S1_IS_BUSY_TRY_LATER);
requestor.sendPacket(msg);
requestor.sendPacket(new SystemMessage(SystemMessage.S1_IS_BUSY_TRY_LATER));
_log.warning(requestor.getName() + " already received a party invitation");
}
}
@@ -106,8 +103,7 @@ public class RequestJoinParty extends ClientBasePacket
requestor.setParty(new Party(requestor, itemDistribution == 1));
target.setTransactionRequester(requestor);
requestor.setTransactionRequester(target);
final AskJoinParty ask = new AskJoinParty(requestor.getObjectId(), itemDistribution);
target.sendPacket(ask);
target.sendPacket(new AskJoinParty(requestor.getObjectId(), itemDistribution));
final SystemMessage msg = new SystemMessage(SystemMessage.YOU_INVITED_S1_TO_PARTY);
msg.addString(target.getName());
requestor.sendPacket(msg);

6
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java
View File

@@ -40,8 +40,7 @@ public class RequestJoinPledge extends ClientBasePacket
}
if (target == activeChar.getObjectId())
{
final SystemMessage sm = new SystemMessage(SystemMessage.CANNOT_INVITE_YOURSELF);
activeChar.sendPacket(sm);
activeChar.sendPacket(new SystemMessage(SystemMessage.CANNOT_INVITE_YOURSELF));
return;
}
if (activeChar.isClanLeader() && ((object = World.getInstance().findObject(target)) instanceof PlayerInstance))
@@ -63,8 +62,7 @@ public class RequestJoinPledge extends ClientBasePacket
}
member.setTransactionRequester(activeChar);
activeChar.setTransactionRequester(member);
final AskJoinPledge ap = new AskJoinPledge(activeChar.getObjectId(), activeChar.getClan().getName());
member.sendPacket(ap);
member.sendPacket(new AskJoinPledge(activeChar.getObjectId(), activeChar.getClan().getName()));
}
}
}

3
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchDetail.java
View File

@@ -31,7 +31,6 @@ public class RequestPartyMatchDetail extends ClientBasePacket
super(decrypt);
final int objectId = readD();
final PlayerInstance player = (PlayerInstance) World.getInstance().findObject(objectId);
final PartyMatchDetail details = new PartyMatchDetail(player);
client.getConnection().sendPacket(details);
client.getConnection().sendPacket(new PartyMatchDetail(player));
}
}

3
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
View File

@@ -31,8 +31,7 @@ public class RequestPartyMatchList extends ClientBasePacket
final int status = readD();
if (status == 1)
{
final PartyMatchList matchList = new PartyMatchList(World.getInstance().getAllPlayers());
client.getConnection().sendPacket(matchList);
client.getConnection().sendPacket(new PartyMatchList(World.getInstance().getAllPlayers()));
}
// else if (status == 3)
// {

3
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
View File

@@ -35,8 +35,7 @@ public class RequestPledgeCrest extends ClientBasePacket
final File crestFile = new File("data/crests/Pledge_" + crestId + ".bmp");
if (crestFile.exists())
{
final PledgeCrest pc = new PledgeCrest(crestId, crestFile);
client.getConnection().sendPacket(pc);
client.getConnection().sendPacket(new PledgeCrest(crestId, crestFile));
}
else
{

6
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
View File

@@ -41,12 +41,10 @@ public class RequestPledgeInfo extends ClientBasePacket
_log.warning("Clan data for clanId " + clanId + " is missing");
return;
}
final PledgeInfo pc = new PledgeInfo(clan);
activeChar.sendPacket(pc);
activeChar.sendPacket(new PledgeInfo(clan));
if (clan.getClanId() == activeChar.getClanId())
{
final PledgeShowMemberListAll pm = new PledgeShowMemberListAll(clan, activeChar);
activeChar.sendPacket(pm);
activeChar.sendPacket(new PledgeShowMemberListAll(clan, activeChar));
}
}
}

3
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberList.java
View File

@@ -31,8 +31,7 @@ public class RequestPledgeMemberList extends ClientBasePacket
final Clan clan = activeChar.getClan();
if (clan != null)
{
final PledgeShowMemberListAll pm = new PledgeShowMemberListAll(clan, activeChar);
activeChar.sendPacket(pm);
activeChar.sendPacket(new PledgeShowMemberListAll(clan, activeChar));
}
}
}

6
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java
View File

@@ -45,9 +45,7 @@ public class RequestSetPledgeCrest extends ClientBasePacket
final FileOutputStream out = new FileOutputStream(crestFile);
out.write(data);
out.close();
final UserInfo ui = new UserInfo(activeChar);
activeChar.sendPacket(ui);
final CharInfo ci = new CharInfo(activeChar);
activeChar.broadcastPacket(ci);
activeChar.sendPacket(new UserInfo(activeChar));
activeChar.broadcastPacket(new CharInfo(activeChar));
}
}

6
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
View File

@@ -45,11 +45,9 @@ public class RequestUnEquipItem extends ClientBasePacket
activeChar.updatePAtk();
activeChar.updateMDef();
activeChar.updateMAtk();
final UserInfo ui = new UserInfo(activeChar);
activeChar.sendPacket(ui);
activeChar.sendPacket(new UserInfo(activeChar));
activeChar.setAttackStatus(false);
final CharInfo info = new CharInfo(activeChar);
activeChar.broadcastPacket(info);
activeChar.broadcastPacket(new CharInfo(activeChar));
if (!unequiped.isEmpty())
{
final SystemMessage sm = new SystemMessage(SystemMessage.S1_DISARMED);

3
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java
View File

@@ -60,8 +60,7 @@ public class SendBypassBuildCmd extends ClientBasePacket
try
{
final String text = command.substring(7);
final CreatureSay cs = new CreatureSay(0, 9, activeChar.getName(), text);
GmListManager.getInstance().broadcastToGMs(cs);
GmListManager.getInstance().broadcastToGMs(new CreatureSay(0, 9, activeChar.getName(), text));
}
catch (StringIndexOutOfBoundsException e)
{

3
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendPrivateStoreBuyList.java
View File

@@ -65,8 +65,7 @@ public class SendPrivateStoreBuyList extends ClientBasePacket
}
else
{
final SystemMessage msg = new SystemMessage(SystemMessage.YOU_NOT_ENOUGH_ADENA);
buyer.sendPacket(msg);
buyer.sendPacket(new SystemMessage(SystemMessage.YOU_NOT_ENOUGH_ADENA));
}
}
}

6
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java
View File

@@ -55,8 +55,7 @@ public class SendWareHouseWithDrawList extends ClientBasePacket
final StatusUpdate su = new StatusUpdate(activeChar.getObjectId());
su.addAttribute(StatusUpdate.CUR_LOAD, activeChar.getCurrentLoad());
activeChar.sendPacket(su);
final ItemList il = new ItemList(activeChar, false);
activeChar.sendPacket(il);
activeChar.sendPacket(new ItemList(activeChar, false));
}
else
{
@@ -64,8 +63,7 @@ public class SendWareHouseWithDrawList extends ClientBasePacket
{
World.getInstance().removeVisibleObject(items[i]);
}
final SystemMessage sm = new SystemMessage(SystemMessage.WEIGHT_LIMIT_EXCEEDED);
activeChar.sendPacket(sm);
activeChar.sendPacket(new SystemMessage(SystemMessage.WEIGHT_LIMIT_EXCEEDED));
}
}
}

3
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java
View File

@@ -58,8 +58,7 @@ public class SetPrivateStoreListBuy extends ClientBasePacket
if (cost > player.getAdena())
{
count = 0;
final SystemMessage msg = new SystemMessage(SystemMessage.THE_PURCHASE_PRICE_IS_HIGHER_THAN_MONEY);
player.sendPacket(msg);
player.sendPacket(new SystemMessage(SystemMessage.THE_PURCHASE_PRICE_IS_HIGHER_THAN_MONEY));
}
if (count != 0)
{

3
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/TradeDone.java
View File

@@ -72,8 +72,7 @@ public class TradeDone extends ClientBasePacket
else
{
player.sendPacket(new SendTradeDone(0));
final SystemMessage msg = new SystemMessage(SystemMessage.TARGET_IS_NOT_FOUND_IN_THE_GAME);
player.sendPacket(msg);
player.sendPacket(new SystemMessage(SystemMessage.TARGET_IS_NOT_FOUND_IN_THE_GAME));
player.setTransactionRequester(null);
requestor.setTradeList(null);
player.setTradeList(null);

9
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
View File

@@ -60,13 +60,10 @@ public class UseItem extends ClientBasePacket
final SystemMessage sm = new SystemMessage(SystemMessage.S1_EQUIPPED);
sm.addItemName(item.getItemId());
activeChar.sendPacket(sm);
final InventoryUpdate iu = new InventoryUpdate(items);
activeChar.sendPacket(iu);
final UserInfo ui = new UserInfo(activeChar);
activeChar.sendPacket(ui);
activeChar.sendPacket(new InventoryUpdate(items));
activeChar.sendPacket(new UserInfo(activeChar));
activeChar.setAttackStatus(false);
final CharInfo info = new CharInfo(activeChar);
activeChar.broadcastPacket(info);
activeChar.broadcastPacket(new CharInfo(activeChar));
}
else if (item != null)
{