diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/handler/IItemHandler.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/handler/IItemHandler.java index d9ad361f7a..15a270535e 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/handler/IItemHandler.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/handler/IItemHandler.java @@ -17,14 +17,12 @@ */ package org.l2jmobius.gameserver.handler; -import java.io.IOException; - import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public interface IItemHandler { - public int useItem(PlayerInstance var1, ItemInstance var2) throws IOException; + public int useItem(PlayerInstance var1, ItemInstance item); public int[] getItemIds(); } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java index 32097ab056..67a08db879 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java @@ -17,17 +17,13 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.io.IOException; - import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.ClientThread; -import org.l2jmobius.gameserver.network.Connection; import org.l2jmobius.gameserver.network.serverpackets.CharInfo; import org.l2jmobius.gameserver.network.serverpackets.NpcInfo; import org.l2jmobius.gameserver.network.serverpackets.SpawnItem; @@ -37,49 +33,42 @@ public class Appearing extends ClientBasePacket { private static final String _C__30_APPEARING = "[C] 30 Appearing"; - public Appearing(byte[] decrypt, ClientThread client) throws IOException + public Appearing(byte[] decrypt, ClientThread client) { super(decrypt); final PlayerInstance activeChar = client.getActiveChar(); activeChar.removeAllKnownObjects(); - final Connection con = client.getConnection(); - final UserInfo ui = new UserInfo(activeChar); - con.sendPacket(ui); + + activeChar.sendPacket(new UserInfo(activeChar)); for (WorldObject worldObject : World.getInstance().getVisibleObjects(activeChar, 2000)) { - NpcInfo ni; - Creature npc; activeChar.addKnownObject(worldObject); if (worldObject instanceof ItemInstance) { - final SpawnItem si = new SpawnItem((ItemInstance) worldObject); - con.sendPacket(si); + activeChar.sendPacket(new SpawnItem((ItemInstance) worldObject)); continue; } if (worldObject instanceof NpcInstance) { - ni = new NpcInfo((NpcInstance) worldObject); - con.sendPacket(ni); - npc = (NpcInstance) worldObject; + activeChar.sendPacket(new NpcInfo((NpcInstance) worldObject)); + final NpcInstance npc = (NpcInstance) worldObject; npc.addKnownObject(activeChar); continue; } if (worldObject instanceof PetInstance) { - ni = new NpcInfo((PetInstance) worldObject); - con.sendPacket(ni); - npc = (PetInstance) worldObject; - npc.addKnownObject(activeChar); + activeChar.sendPacket(new NpcInfo((PetInstance) worldObject)); + final PetInstance pet = (PetInstance) worldObject; + pet.addKnownObject(activeChar); continue; } - if (!(worldObject instanceof PlayerInstance)) + if (worldObject instanceof PlayerInstance) { - continue; + final PlayerInstance player = (PlayerInstance) worldObject; + activeChar.sendPacket(new CharInfo(player)); + player.addKnownObject(activeChar); + player.sendPacket(new CharInfo(activeChar)); } - final PlayerInstance player = (PlayerInstance) worldObject; - con.sendPacket(new CharInfo(player)); - player.addKnownObject(activeChar); - player.getNetConnection().sendPacket(new CharInfo(activeChar)); } World.getInstance().addVisibleObject(activeChar); } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 9e6c908791..ea2c05122e 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -17,8 +17,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.io.IOException; - import org.l2jmobius.gameserver.Announcements; import org.l2jmobius.gameserver.data.MapRegionTable; import org.l2jmobius.gameserver.managers.GmListManager; @@ -27,7 +25,6 @@ import org.l2jmobius.gameserver.model.ShortCut; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.ClientThread; -import org.l2jmobius.gameserver.network.Connection; import org.l2jmobius.gameserver.network.serverpackets.Die; import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit; @@ -38,19 +35,17 @@ public class EnterWorld extends ClientBasePacket { private static final String _C__03_ENTERWORLD = "[C] 03 EnterWorld"; - public EnterWorld(byte[] decrypt, ClientThread client) throws IOException + public EnterWorld(byte[] decrypt, ClientThread client) { super(decrypt); final PlayerInstance activeChar = client.getActiveChar(); - final Connection con = client.getConnection(); if (client.getAccessLevel() >= 100) { activeChar.setIsGM(true); GmListManager.getInstance().addGm(activeChar); } - final SystemMessage sm = new SystemMessage(SystemMessage.WELCOME_TO_LINEAGE); - con.sendPacket(sm); + activeChar.sendPacket(new SystemMessage(SystemMessage.WELCOME_TO_LINEAGE)); Announcements.getInstance().showAnnouncements(activeChar); final ItemList il = new ItemList(activeChar, false); @@ -82,10 +77,9 @@ public class EnterWorld extends ClientBasePacket } } } - con.sendPacket(sci); + activeChar.sendPacket(sci); - final UserInfo ui = new UserInfo(activeChar); - con.sendPacket(ui); + activeChar.sendPacket(new UserInfo(activeChar)); if (activeChar.isDead()) { activeChar.sendPacket(new Die(activeChar)); diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index bee703197f..4c2315f1ea 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -17,8 +17,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.io.IOException; - import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -28,7 +26,7 @@ public class Logout extends ClientBasePacket { private static final String _C__09_LOGOUT = "[C] 09 Logout"; - public Logout(byte[] decrypt, ClientThread client) throws IOException + public Logout(byte[] decrypt, ClientThread client) { super(decrypt); @@ -48,8 +46,7 @@ public class Logout extends ClientBasePacket return; } - final LeaveWorld ql = new LeaveWorld(); - client.getConnection().sendPacket(ql); + player.sendPacket(new LeaveWorld()); player.deleteMe(); client.saveCharToDisk(player); } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java index f4b940c25d..688da930cc 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java @@ -34,8 +34,7 @@ public class RequestAllyCrest extends ClientBasePacket final File crestFile = new File("data/allycrest_" + crestId + ".bmp"); if (crestFile.exists()) { - final AllyCrest ac = new AllyCrest(crestId, crestFile); - client.getConnection().sendPacket(ac); + client.getConnection().sendPacket(new AllyCrest(crestId, crestFile)); } else { diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java index b404d4cce9..5e9d4dcfb6 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java @@ -17,7 +17,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.io.IOException; import java.util.Collection; import org.l2jmobius.gameserver.data.SkillTable; @@ -38,7 +37,7 @@ public class RequestAquireSkill extends ClientBasePacket { private static final String _C__6C_REQUESTAQUIRESKILL = "[C] 6C RequestAquireSkill"; - public RequestAquireSkill(byte[] rawPacket, ClientThread client) throws IOException + public RequestAquireSkill(byte[] rawPacket, ClientThread client) { super(rawPacket); final int id = readD(); @@ -111,7 +110,7 @@ public class RequestAquireSkill extends ClientBasePacket { asl.addSkill(skillLearn.getId(), skillLearn.getLevel(), skillLearn.getLevel(), skillLearn.getSpCost(), 0); } - player.getNetConnection().sendPacket(asl); + player.sendPacket(asl); } @Override diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkillInfo.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkillInfo.java index 24803c9b50..ef95eca65f 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkillInfo.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkillInfo.java @@ -17,28 +17,25 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.io.IOException; - import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.SkillTreeTable; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.ClientThread; -import org.l2jmobius.gameserver.network.Connection; import org.l2jmobius.gameserver.network.serverpackets.AquireSkillInfo; public class RequestAquireSkillInfo extends ClientBasePacket { private static final String _C__6B_REQUESTAQUIRESKILLINFO = "[C] 6B RequestAquireSkillInfo"; - public RequestAquireSkillInfo(byte[] rawPacket, ClientThread client) throws IOException + public RequestAquireSkillInfo(byte[] rawPacket, ClientThread client) { super(rawPacket); - final PlayerInstance activeChar = client.getActiveChar(); - final Connection con = client.getConnection(); final int id = readD(); final int level = readD(); + + final PlayerInstance activeChar = client.getActiveChar(); final Skill skill = SkillTable.getInstance().getInfo(id, level); int requiredSp = 0; for (SkillLearn skill2 : SkillTreeTable.getInstance().getAvailableSkills(activeChar)) @@ -50,8 +47,7 @@ public class RequestAquireSkillInfo extends ClientBasePacket requiredSp = skill2.getSpCost(); break; } - final AquireSkillInfo asi = new AquireSkillInfo(skill.getId(), skill.getLevel(), requiredSp); - con.sendPacket(asi); + activeChar.sendPacket(new AquireSkillInfo(skill.getId(), skill.getLevel(), requiredSp)); } @Override diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 223f9d4e4e..12a87ae911 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -17,14 +17,11 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.io.IOException; - import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.ClientThread; -import org.l2jmobius.gameserver.network.Connection; import org.l2jmobius.gameserver.network.serverpackets.DropItem; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -34,7 +31,7 @@ public class RequestDropItem extends ClientBasePacket { private static final String _C__12_REQUESTDROPITEM = "[C] 12 RequestDropItem"; - public RequestDropItem(byte[] decrypt, ClientThread client) throws IOException + public RequestDropItem(byte[] decrypt, ClientThread client) { super(decrypt); final int objectId = readD(); @@ -42,14 +39,15 @@ public class RequestDropItem extends ClientBasePacket final int x = readD(); final int y = readD(); final int z = readD(); + if (count == 0) { return; } - if ((client.getActiveChar().getPrivateStoreType() == 0) && (client.getActiveChar().getTransactionRequester() == null)) + + final PlayerInstance activeChar = client.getActiveChar(); + if ((activeChar.getPrivateStoreType() == 0) && (activeChar.getTransactionRequester() == null)) { - final Connection con = client.getConnection(); - final PlayerInstance activeChar = client.getActiveChar(); final ItemInstance oldItem = activeChar.getInventory().getItem(objectId); if (oldItem == null) { @@ -73,9 +71,8 @@ public class RequestDropItem extends ClientBasePacket dropedItem = activeChar.getInventory().dropItem(objectId, count); final InventoryUpdate iu = new InventoryUpdate(); iu.addModifiedItem(oldItem); - con.sendPacket(iu); - final UserInfo ui = new UserInfo(activeChar); - con.sendPacket(ui); + activeChar.sendPacket(iu); + activeChar.sendPacket(new UserInfo(activeChar)); } else { @@ -101,17 +98,17 @@ public class RequestDropItem extends ClientBasePacket { iu.addModifiedItem(oldItem); } - con.sendPacket(iu); + activeChar.sendPacket(iu); final SystemMessage sm = new SystemMessage(SystemMessage.YOU_DROPPED_S1); sm.addItemName(dropedItem.getItemId()); - con.sendPacket(sm); - con.sendPacket(new UserInfo(activeChar)); + activeChar.sendPacket(sm); + activeChar.sendPacket(new UserInfo(activeChar)); World.getInstance().addVisibleObject(dropedItem); } else { final SystemMessage msg = new SystemMessage(SystemMessage.NOTHING_HAPPENED); - client.getActiveChar().sendPacket(msg); + activeChar.sendPacket(msg); } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java index 3b93a553eb..643ad5b953 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java @@ -17,8 +17,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.io.IOException; - +import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.ItemList; @@ -26,11 +25,12 @@ public class RequestItemList extends ClientBasePacket { private static final String _C__0F_REQUESTITEMLIST = "[C] 0F RequestItemList"; - public RequestItemList(byte[] rawPacket, ClientThread client) throws IOException + public RequestItemList(byte[] rawPacket, ClientThread client) { super(rawPacket); - final ItemList il = new ItemList(client.getActiveChar(), true); - client.getConnection().sendPacket(il); + + final PlayerInstance activeChar = client.getActiveChar(); + activeChar.sendPacket(new ItemList(activeChar, true)); } @Override diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java index 2f183e9e54..6efb41400d 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java @@ -29,8 +29,7 @@ public class RequestQuestList extends ClientBasePacket public RequestQuestList(byte[] decrypt, ClientThread client) throws IOException { super(decrypt); - final QuestList ql = new QuestList(); - client.getConnection().sendPacket(ql); + client.getConnection().sendPacket(new QuestList()); } @Override diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java index 2ec137a71c..6a18bc6ef6 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java @@ -17,8 +17,6 @@ lo * This file is part of the L2J Mobius project. */ package org.l2jmobius.gameserver.network.clientpackets; -import java.io.IOException; - import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -29,7 +27,7 @@ public class RequestRestart extends ClientBasePacket { private static final String _C__46_REQUESTRESTART = "[C] 46 RequestRestart"; - public RequestRestart(byte[] decrypt, ClientThread client) throws IOException + public RequestRestart(byte[] decrypt, ClientThread client) { super(decrypt); @@ -50,12 +48,10 @@ public class RequestRestart extends ClientBasePacket } player.deleteMe(); - final RestartResponse response = new RestartResponse(); - client.getConnection().sendPacket(response); + player.sendPacket(new RestartResponse()); client.saveCharToDisk(client.getActiveChar()); client.setActiveChar(null); - final CharSelectInfo cl = new CharSelectInfo(client.getLoginName(), client.getSessionId()); - client.getConnection().sendPacket(cl); + player.sendPacket(new CharSelectInfo(client.getLoginName(), client.getSessionId())); } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index f56d487dd3..466d0475ae 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -17,12 +17,9 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.io.IOException; - import org.l2jmobius.gameserver.data.MapRegionTable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.ClientThread; -import org.l2jmobius.gameserver.network.Connection; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.Revive; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; @@ -32,16 +29,15 @@ public class RequestRestartPoint extends ClientBasePacket { private static final String _C__6d_REQUESTRESTARTPOINT = "[C] 6d RequestRestartPoint"; - public RequestRestartPoint(byte[] decrypt, ClientThread client) throws IOException + public RequestRestartPoint(byte[] decrypt, ClientThread client) { super(decrypt); - final Connection con = client.getConnection(); + final PlayerInstance activeChar = client.getActiveChar(); final int[] townCords = MapRegionTable.getInstance().getClosestTownCords(activeChar); final StopMove stopMove = new StopMove(activeChar); - con.sendPacket(stopMove); - final ActionFailed actionFailed = new ActionFailed(); - con.sendPacket(actionFailed); + activeChar.sendPacket(stopMove); + activeChar.sendPacket(new ActionFailed()); activeChar.broadcastPacket(stopMove); activeChar.teleToLocation(townCords[0], townCords[1], townCords[2]); activeChar.setCurrentHp(0.6 * activeChar.getMaxHp()); diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java index 1f761f95bf..53bf6495fa 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java @@ -17,44 +17,41 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.io.IOException; - import org.l2jmobius.gameserver.model.ShortCut; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.ClientThread; -import org.l2jmobius.gameserver.network.Connection; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; public class RequestShortCutReg extends ClientBasePacket { private static final String _C__33_REQUESTSHORTCUTREG = "[C] 33 RequestShortCutReg"; - public RequestShortCutReg(byte[] rawPacket, ClientThread client) throws IOException + public RequestShortCutReg(byte[] rawPacket, ClientThread client) { super(rawPacket); - final PlayerInstance activeChar = client.getActiveChar(); - final Connection con = client.getConnection(); final int type = readD(); final int slot = readD(); final int id = readD(); final int unk = readD(); + + final PlayerInstance activeChar = client.getActiveChar(); switch (type) { - case 1: - case 3: + case ShortCut.TYPE_ITEM: + case ShortCut.TYPE_ACTION: { - con.sendPacket(new ShortCutRegister(slot, type, id, unk)); + activeChar.sendPacket(new ShortCutRegister(slot, type, id, unk)); activeChar.registerShortCut(new ShortCut(slot, type, id, -1, unk)); break; } - case 2: + case ShortCut.TYPE_SKILL: { final int level = activeChar.getSkillLevel(id); if (level <= 0) { break; } - con.sendPacket(new ShortCutRegister(slot, type, id, level, unk)); + activeChar.sendPacket(new ShortCutRegister(slot, type, id, level, unk)); activeChar.registerShortCut(new ShortCut(slot, type, id, level, unk)); break; } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java index 1d418d3322..eff71261f0 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java @@ -17,9 +17,8 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.io.IOException; - import org.l2jmobius.gameserver.model.Skill; +import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.SkillList; @@ -27,15 +26,16 @@ public class RequestSkillList extends ClientBasePacket { private static final String _C__3F_REQUESTSKILLLIST = "[C] 3F RequestSkillList"; - public RequestSkillList(byte[] rawPacket, ClientThread client) throws IOException + public RequestSkillList(byte[] rawPacket, ClientThread client) { super(rawPacket); final SkillList response = new SkillList(); - for (Skill skill : client.getActiveChar().getAllSkills()) + final PlayerInstance activeChar = client.getActiveChar(); + for (Skill skill : activeChar.getAllSkills()) { response.addSkill(skill.getId(), skill.getLevel(), skill.isPassive()); } - client.getConnection().sendPacket(response); + activeChar.sendPacket(response); } @Override diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java index 34ff8a26ff..6acc06a117 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java @@ -17,9 +17,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.io.IOException; - -import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.TargetUnselected; @@ -28,20 +25,15 @@ public class RequestTargetCanceld extends ClientBasePacket { private static final String _C__37_REQUESTTARGETCANCELD = "[C] 37 RequestTargetCanceld"; - public RequestTargetCanceld(byte[] rawPacket, ClientThread client) throws IOException + public RequestTargetCanceld(byte[] rawPacket, ClientThread client) { super(rawPacket); final PlayerInstance activeChar = client.getActiveChar(); if (activeChar.getTarget() != null) { - final TargetUnselected atk = new TargetUnselected(activeChar); - client.getConnection().sendPacket(atk); - ((Creature) activeChar).setTarget(null); + activeChar.sendPacket(new TargetUnselected(activeChar)); + activeChar.setTarget(null); } - // else - // { - // _log.warning("we have no target to cancel ??"); - // } } @Override diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 23c9166243..67e8c03f4b 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -17,13 +17,10 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.io.IOException; - import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.ClientThread; -import org.l2jmobius.gameserver.network.Connection; import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -31,20 +28,18 @@ public class SendWareHouseDepositList extends ClientBasePacket { private static final String _C__31_SENDWAREHOUSEDEPOSITLIST = "[C] 31 SendWareHouseDepositList"; - public SendWareHouseDepositList(byte[] decrypt, ClientThread client) throws IOException + public SendWareHouseDepositList(byte[] decrypt, ClientThread client) { super(decrypt); int i; final PlayerInstance activeChar = client.getActiveChar(); - final Connection con = client.getConnection(); final int count = readD(); final int price = 30; int neededMoney = count * price; final int currentMoney = activeChar.getAdena(); if (neededMoney > currentMoney) { - final SystemMessage sm = new SystemMessage(SystemMessage.YOU_NOT_ENOUGH_ADENA); - con.sendPacket(sm); + activeChar.sendPacket(new SystemMessage(SystemMessage.YOU_NOT_ENOUGH_ADENA)); return; } final ItemInstance[] items = new ItemInstance[count]; @@ -68,8 +63,7 @@ public class SendWareHouseDepositList extends ClientBasePacket neededMoney += price; } activeChar.reduceAdena(neededMoney); - final ItemList il = new ItemList(activeChar, false); - con.sendPacket(il); + activeChar.sendPacket(new ItemList(activeChar, false)); } @Override diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 3c50220a23..041b96c279 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -17,7 +17,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.io.IOException; import java.util.List; import org.l2jmobius.gameserver.handler.IItemHandler; @@ -34,7 +33,7 @@ public class UseItem extends ClientBasePacket { private static final String _C__14_USEITEM = "[C] 14 UseItem"; - public UseItem(byte[] decrypt, ClientThread client) throws IOException + public UseItem(byte[] decrypt, ClientThread client) { super(decrypt); final int objectId = readD();