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

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/RecipeController.java
View File

@@ -76,8 +76,7 @@ public class RecipeController
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.CANT_ALTER_RECIPEBOOK_WHILE_CRAFTING);
player.sendPacket(sm);
player.sendPacket(new SystemMessage(SystemMessageId.CANT_ALTER_RECIPEBOOK_WHILE_CRAFTING));
}
public synchronized void requestMakeItemAbort(PlayerInstance player)
@@ -379,8 +378,7 @@ public class RecipeController
_delay = (int) ((Config.ALT_GAME_CREATION_SPEED * _player.getMReuseRate(_skill) * GameTimeController.TICKS_PER_SECOND) / Config.RATE_CONSUMABLE_COST) * GameTimeController.MILLIS_IN_TICK;
// FIXME: please fix this packet to show crafting animation (somebody)
final MagicSkillUse msk = new MagicSkillUse(_player, _skillId, _skillLevel, _delay, 0);
_player.broadcastPacket(msk);
_player.broadcastPacket(new MagicSkillUse(_player, _skillId, _skillLevel, _delay, 0));
_player.sendPacket(new SetupGauge(0, _delay));
ThreadPool.schedule(this, 100 + _delay);

18
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AbstractAI.java
View File

@@ -616,8 +616,7 @@ abstract class AbstractAI implements Ctrl
_accessor.moveTo(x, y, z);
// Send a Server->Client packet CharMoveToLocation to the actor and all PlayerInstance in its _knownPlayers
final CharMoveToLocation msg = new CharMoveToLocation(_actor);
_actor.broadcastPacket(msg);
_actor.broadcastPacket(new CharMoveToLocation(_actor));
}
else
{
@@ -665,8 +664,7 @@ abstract class AbstractAI implements Ctrl
_clientMoving = false;
// Send a Server->Client packet StopMove to the actor and all PlayerInstance in its _knownPlayers
final StopMove msg = new StopMove(_actor);
_actor.broadcastPacket(msg);
_actor.broadcastPacket(new StopMove(_actor));
if (pos != null)
{
@@ -684,8 +682,7 @@ abstract class AbstractAI implements Ctrl
if (_clientMovingToPawnOffset > 0) // movetoPawn needs to be stopped
{
_clientMovingToPawnOffset = 0;
final StopMove msg = new StopMove(_actor);
_actor.broadcastPacket(msg);
_actor.broadcastPacket(new StopMove(_actor));
}
_clientMoving = false;
}
@@ -768,8 +765,7 @@ abstract class AbstractAI implements Ctrl
protected void clientNotifyDead()
{
// Send a Server->Client packet Die to the actor and all PlayerInstance in its _knownPlayers
final Die msg = new Die(_actor);
_actor.broadcastPacket(msg);
_actor.broadcastPacket(new Die(_actor));
// Init AI
setIntention(AI_INTENTION_IDLE);
@@ -797,14 +793,12 @@ abstract class AbstractAI implements Ctrl
if ((_clientMovingToPawnOffset != 0) && (follow != null))
{
// Send a Server->Client packet MoveToPawn to the actor and all PlayerInstance in its _knownPlayers
final MoveToPawn msg = new MoveToPawn(_actor, follow, _clientMovingToPawnOffset);
player.sendPacket(msg);
player.sendPacket(new MoveToPawn(_actor, follow, _clientMovingToPawnOffset));
}
else
{
// Send a Server->Client packet CharMoveToLocation to the actor and all PlayerInstance in its _knownPlayers
final CharMoveToLocation msg = new CharMoveToLocation(_actor);
player.sendPacket(msg);
player.sendPacket(new CharMoveToLocation(_actor));
}
}
}

12
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/AdminData.java
View File

@@ -353,20 +353,18 @@ public class AdminData implements IXmlReader
{
if (isGmOnline(player.isGM()))
{
final SystemMessage sm = new SystemMessage(SystemMessageId.GM_LIST);
player.sendPacket(sm);
player.sendPacket(new SystemMessage(SystemMessageId.GM_LIST));
for (String name : getAllGmNames(player.isGM()))
{
final SystemMessage sm1 = new SystemMessage(SystemMessageId.GM_S1);
sm1.addString(name);
player.sendPacket(sm1);
final SystemMessage sm = new SystemMessage(SystemMessageId.GM_S1);
sm.addString(name);
player.sendPacket(sm);
}
}
else
{
final SystemMessage sm2 = new SystemMessage(SystemMessageId.NO_GM_PROVIDING_SERVICE_NOW);
player.sendPacket(sm2);
player.sendPacket(new SystemMessage(SystemMessageId.NO_GM_PROVIDING_SERVICE_NOW));
}
}

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/AutoChatHandler.java
View File

@@ -793,12 +793,10 @@ public class AutoChatHandler implements SpawnListener
}
final CreatureSay cs = new CreatureSay(chatNpc.getObjectId(), 0, creatureName, text);
for (PlayerInstance nearbyPlayer : nearbyPlayers)
{
nearbyPlayer.sendPacket(cs);
}
for (PlayerInstance nearbyGM : nearbyGMs)
{
nearbyGM.sendPacket(cs);

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminAnnouncements.java
View File

@@ -175,8 +175,7 @@ public class AdminAnnouncements implements IAdminCommandHandler
{
text1 = activeChar.getName() + ": " + text1;
}
final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), Say2.CRITICAL_ANNOUNCE, "", text1);
Broadcast.toAllOnlinePlayers(cs);
Broadcast.toAllOnlinePlayers(new CreatureSay(activeChar.getObjectId(), Say2.CRITICAL_ANNOUNCE, "", text1));
return true;
}
case admin_list_autoannouncements:

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCreateItem.java
View File

@@ -244,8 +244,7 @@ public class AdminCreateItem implements IAdminCommandHandler
}
player.getInventory().addItem("Admin", id, num, player, null);
final ItemList il = new ItemList(player, true);
player.sendPacket(il);
player.sendPacket(new ItemList(player, true));
if (activeChar.getName().equalsIgnoreCase(player.getName()))
{
BuilderUtil.sendSysMessage(activeChar, "You have spawned " + num + " item(s) number " + id + " in your inventory.");

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDisconnect.java
View File

@@ -77,8 +77,7 @@ public class AdminDisconnect implements IAdminCommandHandler
activeChar.sendPacket(sm);
// Logout Character
final LeaveWorld ql = new LeaveWorld();
player.sendPacket(ql);
player.sendPacket(new LeaveWorld());
player.closeNetConnection();
}

15
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEffects.java
View File

@@ -147,8 +147,7 @@ public class AdminEffects implements IAdminCommandHandler
final int intensity = Integer.parseInt(val1);
final String val2 = st.nextToken();
final int duration = Integer.parseInt(val2);
final Earthquake eq = new Earthquake(activeChar.getX(), activeChar.getY(), activeChar.getZ(), intensity, duration);
activeChar.broadcastPacket(eq);
activeChar.broadcastPacket(new Earthquake(activeChar.getX(), activeChar.getY(), activeChar.getZ(), intensity, duration));
}
catch (Exception e)
{
@@ -347,10 +346,8 @@ public class AdminEffects implements IAdminCommandHandler
activeChar.getPoly().setPolyInfo("npc", id);
activeChar.teleToLocation(activeChar.getX(), activeChar.getY(), activeChar.getZ(), false);
final CharInfo info1 = new CharInfo(activeChar);
activeChar.broadcastPacket(info1);
final UserInfo info2 = new UserInfo(activeChar);
activeChar.sendPacket(info2);
activeChar.broadcastPacket(new CharInfo(activeChar));
activeChar.sendPacket(new UserInfo(activeChar));
}
catch (Exception e)
{
@@ -364,10 +361,8 @@ public class AdminEffects implements IAdminCommandHandler
activeChar.decayMe();
activeChar.spawnMe(activeChar.getX(), activeChar.getY(), activeChar.getZ());
final CharInfo info1 = new CharInfo(activeChar);
activeChar.broadcastPacket(info1);
final UserInfo info2 = new UserInfo(activeChar);
activeChar.sendPacket(info2);
activeChar.broadcastPacket(new CharInfo(activeChar));
activeChar.sendPacket(new UserInfo(activeChar));
}
catch (Exception e)
{

17
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEventEngine.java
View File

@@ -808,11 +808,8 @@ public class AdminEventEngine implements IAdminCommandHandler
target.getPoly().setPolyInfo("npc", id);
target.teleToLocation(target.getX(), target.getY(), target.getZ(), true);
final CharInfo info1 = new CharInfo(target);
target.broadcastPacket(info1);
final UserInfo info2 = new UserInfo(target);
target.sendPacket(info2);
target.broadcastPacket(new CharInfo(target));
target.sendPacket(new UserInfo(target));
}
catch (Exception e)
{
@@ -835,11 +832,8 @@ public class AdminEventEngine implements IAdminCommandHandler
target.decayMe();
target.spawnMe(target.getX(), target.getY(), target.getZ());
final CharInfo info1 = new CharInfo(target);
target.broadcastPacket(info1);
final UserInfo info2 = new UserInfo(target);
target.sendPacket(info2);
target.broadcastPacket(new CharInfo(target));
target.sendPacket(new UserInfo(target));
}
catch (Exception e)
{
@@ -851,8 +845,7 @@ public class AdminEventEngine implements IAdminCommandHandler
{
player.getInventory().addItem("Event", id, num, player, activeChar);
final ItemList il = new ItemList(player, true);
player.sendPacket(il);
player.sendPacket(new ItemList(player, true));
final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
final StringBuilder replyMSG = new StringBuilder("<html><body>");

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminGmChat.java
View File

@@ -116,8 +116,7 @@ public class AdminGmChat implements IAdminCommandHandler
}
text = command.substring(offset);
final CreatureSay cs = new CreatureSay(0, 9, activeChar.getName(), text);
AdminData.broadcastToGMs(cs);
AdminData.broadcastToGMs(new CreatureSay(0, 9, activeChar.getName(), text));
}
catch (StringIndexOutOfBoundsException e)
{

1
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminPForge.java
View File

@@ -75,7 +75,6 @@ public class AdminPForge implements IAdminCommandHandler
}
final AdminForgePacket sp = new AdminForgePacket();
for (int i = 0; i < format.length(); i++)
{
String val = st.nextToken();

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminPolymorph.java
View File

@@ -99,10 +99,8 @@ public class AdminPolymorph implements IAdminCommandHandler
if (obj instanceof Creature)
{
final Creature creature = (Creature) obj;
final MagicSkillUse msk = new MagicSkillUse(creature, 1008, 1, 4000, 0);
creature.broadcastPacket(msk);
final SetupGauge sg = new SetupGauge(0, 4000);
creature.sendPacket(sg);
creature.broadcastPacket(new MagicSkillUse(creature, 1008, 1, 4000, 0));
creature.sendPacket(new SetupGauge(0, 4000));
}
// end of animation

1
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTeleport.java
View File

@@ -533,7 +533,6 @@ public class AdminTeleport implements IAdminCommandHandler
}
final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
final StringBuilder replyMSG = new StringBuilder("<html><title>Teleport Character</title>");
replyMSG.append("<body>");
replyMSG.append("The character you will teleport is " + player.getName() + ".");

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/CharChangePotions.java
View File

@@ -150,8 +150,7 @@ public class CharChangePotions implements IItemHandler
}
// Create a summon effect!
final MagicSkillUse msu = new MagicSkillUse(playable, player, 2003, 1, 1, 0);
player.broadcastPacket(msu);
player.broadcastPacket(new MagicSkillUse(playable, player, 2003, 1, 1, 0));
// Update the changed stat for the character in the DB.
player.store();
@@ -160,8 +159,7 @@ public class CharChangePotions implements IItemHandler
player.destroyItem("Consume", item.getObjectId(), 1, null, false);
// Broadcast the changes to the char and all those nearby.
final UserInfo ui = new UserInfo(player);
player.broadcastPacket(ui);
player.broadcastPacket(new UserInfo(player));
}
@Override

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ChristmasTree.java
View File

@@ -83,8 +83,7 @@ public class ChristmasTree implements IItemHandler
player.destroyItem("Consume", item.getObjectId(), 1, null, false);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2);
player.sendPacket(sm);
player.sendPacket(new SystemMessage(SystemMessageId.S1_S2));
ThreadPool.schedule(new DeSpawn(result), 3600000);
}

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/CompBlessedSpiritShotPacks.java
View File

@@ -75,8 +75,7 @@ public class CompBlessedSpiritShotPacks implements IItemHandler
sm.addNumber(amount);
player.sendPacket(sm);
final ItemList playerUI = new ItemList(player, false);
player.sendPacket(playerUI);
player.sendPacket(new ItemList(player, false));
}
@Override

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/CompShotPacks.java
View File

@@ -97,8 +97,7 @@ public class CompShotPacks implements IItemHandler
sm.addNumber(amount);
player.sendPacket(sm);
final ItemList playerUI = new ItemList(player, false);
player.sendPacket(playerUI);
player.sendPacket(new ItemList(player, false));
}
@Override

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/CompSpiritShotPacks.java
View File

@@ -74,8 +74,7 @@ public class CompSpiritShotPacks implements IItemHandler
sm.addNumber(amount);
player.sendPacket(sm);
final ItemList playerUI = new ItemList(player, false);
player.sendPacket(playerUI);
player.sendPacket(new ItemList(player, false));
}
@Override

66
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/CrystalCarol.java
View File

@@ -63,113 +63,91 @@ public class CrystalCarol implements IItemHandler
if (itemId == 5562) // crystal_carol_01
{
final MagicSkillUse msu = new MagicSkillUse(playable, player, 2140, 1, 1, 0);
player.broadcastPacket(msu);
player.broadcastPacket(new MagicSkillUse(playable, player, 2140, 1, 1, 0));
}
else if (itemId == 5563) // crystal_carol_02
{
final MagicSkillUse msu = new MagicSkillUse(playable, player, 2141, 1, 1, 0);
player.broadcastPacket(msu);
player.broadcastPacket(new MagicSkillUse(playable, player, 2141, 1, 1, 0));
}
else if (itemId == 5564) // crystal_carol_03
{
final MagicSkillUse msu = new MagicSkillUse(playable, player, 2142, 1, 1, 0);
player.broadcastPacket(msu);
player.broadcastPacket(new MagicSkillUse(playable, player, 2142, 1, 1, 0));
}
else if (itemId == 5565) // crystal_carol_04
{
final MagicSkillUse msu = new MagicSkillUse(playable, player, 2143, 1, 1, 0);
player.broadcastPacket(msu);
player.broadcastPacket(new MagicSkillUse(playable, player, 2143, 1, 1, 0));
}
else if (itemId == 5566) // crystal_carol_05
{
final MagicSkillUse msu = new MagicSkillUse(playable, player, 2144, 1, 1, 0);
player.broadcastPacket(msu);
player.broadcastPacket(new MagicSkillUse(playable, player, 2144, 1, 1, 0));
}
else if (itemId == 5583) // crystal_carol_06
{
final MagicSkillUse msu = new MagicSkillUse(playable, player, 2145, 1, 1, 0);
player.broadcastPacket(msu);
player.broadcastPacket(new MagicSkillUse(playable, player, 2145, 1, 1, 0));
}
else if (itemId == 5584) // crystal_carol_07
{
final MagicSkillUse msu = new MagicSkillUse(playable, player, 2146, 1, 1, 0);
player.broadcastPacket(msu);
player.broadcastPacket(new MagicSkillUse(playable, player, 2146, 1, 1, 0));
}
else if (itemId == 5585) // crystal_carol_08
{
final MagicSkillUse msu = new MagicSkillUse(playable, player, 2147, 1, 1, 0);
player.broadcastPacket(msu);
player.broadcastPacket(new MagicSkillUse(playable, player, 2147, 1, 1, 0));
}
else if (itemId == 5586) // crystal_carol_09
{
final MagicSkillUse msu = new MagicSkillUse(playable, player, 2148, 1, 1, 0);
player.broadcastPacket(msu);
player.broadcastPacket(new MagicSkillUse(playable, player, 2148, 1, 1, 0));
}
else if (itemId == 5587) // crystal_carol_10
{
final MagicSkillUse msu = new MagicSkillUse(playable, player, 2149, 1, 1, 0);
player.broadcastPacket(msu);
player.broadcastPacket(new MagicSkillUse(playable, player, 2149, 1, 1, 0));
}
else if (itemId == 4411) // crystal_journey
{
final MagicSkillUse msu = new MagicSkillUse(playable, player, 2069, 1, 1, 0);
player.broadcastPacket(msu);
player.broadcastPacket(new MagicSkillUse(playable, player, 2069, 1, 1, 0));
}
else if (itemId == 4412) // crystal_battle
{
final MagicSkillUse msu = new MagicSkillUse(playable, player, 2068, 1, 1, 0);
player.broadcastPacket(msu);
player.broadcastPacket(new MagicSkillUse(playable, player, 2068, 1, 1, 0));
}
else if (itemId == 4413) // crystal_love
{
final MagicSkillUse msu = new MagicSkillUse(playable, player, 2070, 1, 1, 0);
player.broadcastPacket(msu);
player.broadcastPacket(new MagicSkillUse(playable, player, 2070, 1, 1, 0));
}
else if (itemId == 4414) // crystal_solitude
{
final MagicSkillUse msu = new MagicSkillUse(playable, player, 2072, 1, 1, 0);
player.broadcastPacket(msu);
player.broadcastPacket(new MagicSkillUse(playable, player, 2072, 1, 1, 0));
}
else if (itemId == 4415) // crystal_festival
{
final MagicSkillUse msu = new MagicSkillUse(playable, player, 2071, 1, 1, 0);
player.broadcastPacket(msu);
player.broadcastPacket(new MagicSkillUse(playable, player, 2071, 1, 1, 0));
}
else if (itemId == 4416) // crystal_celebration
{
final MagicSkillUse msu = new MagicSkillUse(playable, player, 2073, 1, 1, 0);
player.broadcastPacket(msu);
player.broadcastPacket(new MagicSkillUse(playable, player, 2073, 1, 1, 0));
}
else if (itemId == 4417) // crystal_comedy
{
final MagicSkillUse msu = new MagicSkillUse(playable, player, 2067, 1, 1, 0);
player.broadcastPacket(msu);
player.broadcastPacket(new MagicSkillUse(playable, player, 2067, 1, 1, 0));
}
else if (itemId == 5010) // crystal_victory
{
final MagicSkillUse msu = new MagicSkillUse(playable, player, 2066, 1, 1, 0);
player.broadcastPacket(msu);
player.broadcastPacket(new MagicSkillUse(playable, player, 2066, 1, 1, 0));
}
else if (itemId == 6903) // music_box_m
{
final MagicSkillUse msu = new MagicSkillUse(playable, player, 2187, 1, 1, 0);
player.broadcastPacket(msu);
player.broadcastPacket(new MagicSkillUse(playable, player, 2187, 1, 1, 0));
}
else if (itemId == 7061) // crystal_birthday
{
final MagicSkillUse msu = new MagicSkillUse(playable, player, 2073, 1, 1, 0);
player.broadcastPacket(msu);
player.broadcastPacket(new MagicSkillUse(playable, player, 2073, 1, 1, 0));
}
else if (itemId == 7062) // crystal_wedding
{
final MagicSkillUse msu = new MagicSkillUse(playable, player, 2230, 1, 1, 0);
player.broadcastPacket(msu);
player.broadcastPacket(new MagicSkillUse(playable, player, 2230, 1, 1, 0));
}
else if (itemId == 8555) // VVKorea
{
final MagicSkillUse msu = new MagicSkillUse(playable, player, 2272, 1, 1, 0);
player.broadcastPacket(msu);
player.broadcastPacket(new MagicSkillUse(playable, player, 2272, 1, 1, 0));
}
player.destroyItem("Consume", item.getObjectId(), 1, null, false);
}

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/EnergyStone.java
View File

@@ -89,8 +89,7 @@ public class EnergyStone implements IItemHandler
if (dummy != null)
{
dummy.getEffects(player, player);
final MagicSkillUse msu = new MagicSkillUse(playable, player, skill.getId(), 1, 1, 0);
player.sendPacket(msu);
player.sendPacket(new MagicSkillUse(playable, player, skill.getId(), 1, 1, 0));
player.destroyItemWithoutTrace("Consume", item.getObjectId(), 1, null, false);
}
return;

9
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/PaganKeys.java
View File

@@ -101,8 +101,7 @@ public class PaganKeys implements IItemHandler
{
player.sendMessage("You failed to open Anterooms Door.");
player.broadcastPacket(new SocialAction(player.getObjectId(), 13));
final PlaySound playSound = new PlaySound("interfacesound.system_close_01");
player.sendPacket(playSound);
player.sendPacket(new PlaySound("interfacesound.system_close_01"));
}
}
else
@@ -126,8 +125,7 @@ public class PaganKeys implements IItemHandler
{
player.sendMessage("You failed to open Altar Entrance.");
player.broadcastPacket(new SocialAction(player.getObjectId(), 13));
final PlaySound playSound = new PlaySound("interfacesound.system_close_01");
player.sendPacket(playSound);
player.sendPacket(new PlaySound("interfacesound.system_close_01"));
}
}
else
@@ -151,8 +149,7 @@ public class PaganKeys implements IItemHandler
{
player.sendMessage("You failed to open Door of Darkness.");
player.broadcastPacket(new SocialAction(player.getObjectId(), 13));
final PlaySound playSound = new PlaySound("interfacesound.system_close_01");
player.sendPacket(playSound);
player.sendPacket(new PlaySound("interfacesound.system_close_01"));
}
}
else

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfEscape.java
View File

@@ -190,11 +190,9 @@ public class ScrollOfEscape implements IItemHandler
player.setTarget(player);
final Skill skill = SkillTable.getInstance().getInfo(escapeSkill, 1);
final MagicSkillUse msu = new MagicSkillUse(player, escapeSkill, 1, skill.getHitTime(), 0);
player.broadcastPacket(msu);
player.broadcastPacket(new MagicSkillUse(player, escapeSkill, 1, skill.getHitTime(), 0));
player.setTarget(oldtarget);
final SetupGauge sg = new SetupGauge(0, skill.getHitTime());
player.sendPacket(sg);
player.sendPacket(new SetupGauge(0, skill.getHitTime()));
// End SoE Animation section
player.setTarget(null);

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SevenSignsRecord.java
View File

@@ -52,8 +52,7 @@ public class SevenSignsRecord implements IItemHandler
return;
}
final SSQStatus ssqs = new SSQStatus(player, 1);
player.sendPacket(ssqs);
player.sendPacket(new SSQStatus(player, 1));
}
@Override

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulCrystals.java
View File

@@ -93,8 +93,7 @@ public class SoulCrystals implements IItemHandler
if (!(target instanceof MonsterInstance))
{
// Send a System Message to the caster
final SystemMessage sm = new SystemMessage(SystemMessageId.INCORRECT_TARGET);
player.sendPacket(sm);
player.sendPacket(new SystemMessage(SystemMessageId.INCORRECT_TARGET));
// Send a Server->Client packet ActionFailed to the PlayerInstance
player.sendPacket(ActionFailed.STATIC_PACKET);

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SpecialXMas.java
View File

@@ -53,8 +53,7 @@ public class SpecialXMas implements IItemHandler
if (itemId == 5555) // Token of Love
{
final ShowXMasSeal sxs = new ShowXMasSeal(5555);
player.sendPacket(sxs);
player.sendPacket(new ShowXMasSeal(5555));
}
}

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Blow.java
View File

@@ -259,8 +259,7 @@ public class Blow implements ISkillHandler
// Possibility of a lethal strike
Formulas.calcLethalHit(creature, target, skill);
final PlaySound playSound = new PlaySound("skillsound.critical_hit_02");
creature.sendPacket(playSound);
creature.sendPacket(new PlaySound("skillsound.critical_hit_02"));
}
else
{

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Disablers.java
View File

@@ -212,8 +212,7 @@ public class Disablers implements ISkillHandler
}
else if (creature instanceof PlayerInstance)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WAS_UNAFFECTED_BY_S2);
creature.sendPacket(sm);
creature.sendPacket(new SystemMessage(SystemMessageId.S1_WAS_UNAFFECTED_BY_S2));
}
break; // Used to be fallthrough.
}
@@ -340,8 +339,7 @@ public class Disablers implements ISkillHandler
summonOwner = ((Summon) target).getOwner();
summonPet = summonOwner.getPet();
summonPet.unSummon(summonOwner);
final SystemMessage sm = new SystemMessage(SystemMessageId.LETHAL_STRIKE);
summonOwner.sendPacket(sm);
summonOwner.sendPacket(new SystemMessage(SystemMessageId.LETHAL_STRIKE));
}
else if (creature instanceof PlayerInstance)
{

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/FishingSkill.java
View File

@@ -69,8 +69,7 @@ public class FishingSkill implements ISkillHandler
final ItemInstance weaponInst = creature.getActiveWeaponInstance();
if ((weaponInst == null) || (weaponItem == null) || (weaponItem.getItemType() != WeaponType.ROD))
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED);
creature.sendPacket(sm);
creature.sendPacket(new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED));
return;
}

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

@@ -78,8 +78,7 @@ public class Harvest implements ISkillHandler
if (_player != _target.getSeeder())
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_HARVEST);
_player.sendPacket(sm);
_player.sendPacket(new SystemMessage(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_HARVEST));
continue;
}

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Heal.java
View File

@@ -151,8 +151,7 @@ public class Heal implements ISkillHandler
{
if (skill.getId() == 4051)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.REJUVENATING_HP);
target.sendPacket(sm);
target.sendPacket(new SystemMessage(SystemMessageId.REJUVENATING_HP));
}
else if ((creature instanceof PlayerInstance) && (creature != target))
{

1
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Manadam.java
View File

@@ -89,7 +89,6 @@ public class Manadam implements ISkillHandler
target.sendPacket(sump);
final SystemMessage sm = new SystemMessage(SystemMessageId.S2_MP_HAS_BEEN_DRAINED_BY_S1);
if (creature instanceof NpcInstance)
{
final int mobId = ((NpcInstance) creature).getNpcId();

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Pdam.java
View File

@@ -313,8 +313,7 @@ public class Pdam implements ISkillHandler
}
else
{
final SystemMessage sm = new SystemMessage(SystemMessageId.FORCE_MAXLEVEL_REACHED);
creature.sendPacket(sm);
creature.sendPacket(new SystemMessage(SystemMessageId.FORCE_MAXLEVEL_REACHED));
}
}
else if (skill.getId() == 345) // Sonic Rage

7
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/Escape.java
View File

@@ -123,7 +123,6 @@ public class Escape implements IUserCommandHandler
}
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2);
if (unstuckTimer < 60000)
{
sm.addString("You use Escape: " + (unstuckTimer / 1000) + " seconds.");
@@ -140,11 +139,9 @@ public class Escape implements IUserCommandHandler
player.setTarget(player);
player.disableAllSkills();
final MagicSkillUse msk = new MagicSkillUse(player, 1050, 1, unstuckTimer, 0);
player.setTarget(null); // Like retail we haven't self target
Broadcast.toSelfAndKnownPlayersInRadius(player, msk, 810000);
final SetupGauge sg = new SetupGauge(0, unstuckTimer);
player.sendPacket(sg);
Broadcast.toSelfAndKnownPlayersInRadius(player, new MagicSkillUse(player, 1050, 1, unstuckTimer, 0), 810000);
player.sendPacket(new SetupGauge(0, unstuckTimer));
// End SoE Animation section
final EscapeFinalizer ef = new EscapeFinalizer(player);
// continue execution later

18
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/Mount.java
View File

@@ -52,26 +52,22 @@ public class Mount implements IUserCommandHandler
if (player.isDead())
{
// A strider cannot be ridden when player is dead.
final SystemMessage msg = new SystemMessage(SystemMessageId.STRIDER_CANT_BE_RIDDEN_WHILE_DEAD);
player.sendPacket(msg);
player.sendPacket(new SystemMessage(SystemMessageId.STRIDER_CANT_BE_RIDDEN_WHILE_DEAD));
}
else if (pet.isDead())
{
// A dead strider cannot be ridden.
final SystemMessage msg = new SystemMessage(SystemMessageId.DEAD_STRIDER_CANT_BE_RIDDEN);
player.sendPacket(msg);
player.sendPacket(new SystemMessage(SystemMessageId.DEAD_STRIDER_CANT_BE_RIDDEN));
}
else if (pet.isInCombat())
{
// A strider in battle cannot be ridden.
final SystemMessage msg = new SystemMessage(SystemMessageId.STRIDER_IN_BATLLE_CANT_BE_RIDDEN);
player.sendPacket(msg);
player.sendPacket(new SystemMessage(SystemMessageId.STRIDER_IN_BATLLE_CANT_BE_RIDDEN));
}
else if (player.isInCombat())
{
// A pet cannot be ridden while player is in battle.
final SystemMessage msg = new SystemMessage(SystemMessageId.STRIDER_CANT_BE_RIDDEN_WHILE_IN_BATTLE);
player.sendPacket(msg);
player.sendPacket(new SystemMessage(SystemMessageId.STRIDER_CANT_BE_RIDDEN_WHILE_IN_BATTLE));
}
else if (!player.isInsideRadius(pet, 60, true, false))
{
@@ -80,15 +76,13 @@ public class Mount implements IUserCommandHandler
}
else if (!GeoEngine.getInstance().canSeeTarget(player, pet))
{
final SystemMessage msg = new SystemMessage(SystemMessageId.CANT_SEE_TARGET);
player.sendPacket(msg);
player.sendPacket(new SystemMessage(SystemMessageId.CANT_SEE_TARGET));
return false;
}
else if (player.isSitting() || player.isMoving())
{
// A strider can be ridden only when player is standing.
final SystemMessage msg = new SystemMessage(SystemMessageId.STRIDER_CAN_BE_RIDDEN_ONLY_WHILE_STANDING);
player.sendPacket(msg);
player.sendPacket(new SystemMessage(SystemMessageId.STRIDER_CAN_BE_RIDDEN_ONLY_WHILE_STANDING));
}
else if (!pet.isDead() && !player.isMounted())
{

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/FarmPvpCmd.java
View File

@@ -114,8 +114,7 @@ public class FarmPvpCmd implements IVoicedCommandHandler
activeChar.sendMessage("Sorry, you can't use this command while registered in Olympiad");
return false;
}
final SetupGauge sg = new SetupGauge(SetupGauge.BLUE, 15000);
activeChar.sendPacket(sg);
activeChar.sendPacket(new SetupGauge(SetupGauge.BLUE, 15000));
activeChar.setImmobilized(true);
ThreadPool.schedule(new teleportTask(activeChar, placex, placey, placez, message), 15000);

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java
View File

@@ -389,10 +389,8 @@ public class Wedding implements IVoicedCommandHandler
activeChar.setTarget(activeChar);
activeChar.disableAllSkills();
final MagicSkillUse msk = new MagicSkillUse(activeChar, 1050, 1, teleportTimer, 0);
Broadcast.toSelfAndKnownPlayersInRadius(activeChar, msk, 810000/* 900 */);
final SetupGauge sg = new SetupGauge(0, teleportTimer);
activeChar.sendPacket(sg);
Broadcast.toSelfAndKnownPlayersInRadius(activeChar, new MagicSkillUse(activeChar, 1050, 1, teleportTimer, 0), 810000/* 900 */);
activeChar.sendPacket(new SetupGauge(0, teleportTimer));
// End SoE Animation section
final EscapeFinalizer ef = new EscapeFinalizer(activeChar, partner.getX(), partner.getY(), partner.getZ(), partner.isIn7sDungeon());

13
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/CursedWeapon.java
View File

@@ -218,20 +218,18 @@ public class CursedWeapon
_isActivated = false;
final SystemMessage sm = new SystemMessage(SystemMessageId.S2_WAS_DROPPED_IN_THE_S1_REGION);
if (fromMonster)
{
_item = attackable.DropItem(player, _itemId, 1);
_item.setDropTime(0); // Prevent item from being removed by ItemsAutoDestroy
// RedSky and Earthquake
final ExRedSky packet = new ExRedSky(10);
final ExRedSky rs = new ExRedSky(10);
final Earthquake eq = new Earthquake(player.getX(), player.getY(), player.getZ(), 14, 3);
for (PlayerInstance aPlayer : World.getInstance().getAllPlayers())
{
aPlayer.sendPacket(packet);
aPlayer.sendPacket(rs);
aPlayer.sendPacket(eq);
}
@@ -349,8 +347,7 @@ public class CursedWeapon
{
if (_player.setMountType(0))
{
final Ride dismount = new Ride(_player.getObjectId(), Ride.ACTION_DISMOUNT, 0);
_player.broadcastPacket(dismount);
_player.broadcastPacket(new Ride(_player.getObjectId(), Ride.ACTION_DISMOUNT, 0));
_player.setMountObjectID(0);
}
else
@@ -420,9 +417,7 @@ public class CursedWeapon
// Refresh player stats
_player.broadcastUserInfo();
final SocialAction atk = new SocialAction(_player.getObjectId(), 17);
_player.broadcastPacket(atk);
_player.broadcastPacket(new SocialAction(_player.getObjectId(), 17));
sm = new SystemMessage(SystemMessageId.THE_OWNER_OF_S2_HAS_APPEARED_IN_THE_S1_REGION);
sm.addZoneName(_player.getX(), _player.getY(), _player.getZ()); // Region Name

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/WorldObject.java
View File

@@ -181,8 +181,7 @@ public abstract class WorldObject
final WorldRegion oldregion = getPosition().getWorldRegion();
// Create a server->client GetItem packet to pick up the ItemInstance
final GetItem gi = new GetItem((ItemInstance) this, creature.getObjectId());
creature.broadcastPacket(gi);
creature.broadcastPacket(new GetItem((ItemInstance) this, creature.getObjectId()));
synchronized (this)
{

17
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@@ -1259,8 +1259,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
sendPacket(new SystemMessage(SystemMessageId.GETTING_READY_TO_SHOOT_AN_ARROW));
// Send a Server->Client packet SetupGauge
final SetupGauge sg = new SetupGauge(SetupGauge.RED, sAtk + reuse);
sendPacket(sg);
sendPacket(new SetupGauge(SetupGauge.RED, sAtk + reuse));
}
// Create a new hit task with Medium priority
@@ -1558,8 +1557,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
// Can't use Hero and resurrect skills during Olympiad
if ((creature instanceof PlayerInstance) && ((PlayerInstance) creature).isInOlympiadMode() && (skill.isHeroSkill() || (skill.getSkillType() == SkillType.RESURRECT)))
{
final SystemMessage sm = new SystemMessage(SystemMessageId.THIS_SKILL_IS_NOT_AVAILABLE_FOR_THE_OLYMPIAD_EVENT);
sendPacket(sm);
sendPacket(new SystemMessage(SystemMessageId.THIS_SKILL_IS_NOT_AVAILABLE_FOR_THE_OLYMPIAD_EVENT));
return;
}
@@ -1890,8 +1888,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
// Send a Server->Client packet SetupGauge with the color of the gauge and the casting time
if ((creature instanceof PlayerInstance) && !forceBuff)
{
final SetupGauge sg = new SetupGauge(SetupGauge.BLUE, hitTime);
sendPacket(sg);
sendPacket(new SetupGauge(SetupGauge.BLUE, hitTime));
}
// Disable all skills during the casting
@@ -3968,8 +3965,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
((PlayerInstance) this).setRecentFakeDeath(true);
}
final ChangeWaitType revive = new ChangeWaitType(this, ChangeWaitType.WT_STOP_FAKEDEATH);
broadcastPacket(revive);
broadcastPacket(new ChangeWaitType(this, ChangeWaitType.WT_STOP_FAKEDEATH));
broadcastPacket(new Revive(this));
getAI().notifyEvent(CtrlEvent.EVT_THINK, null);
}
@@ -6477,7 +6473,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
if (target instanceof PlayerInstance)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.AVOIDED_S1S_ATTACK);
if (this instanceof Summon)
{
final int mobId = ((Summon) this).getTemplate().getNpcId();
@@ -6487,7 +6482,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
{
sm.addString(getName());
}
((PlayerInstance) target).sendPacket(sm);
}
}
@@ -10157,8 +10151,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
// Send a Server->Client packet MyTargetSelected to the PlayerInstance player
// The player.getLevel() - getLevel() permit to display the correct color in the select window
final MyTargetSelected my = new MyTargetSelected(trasformedNpc.getObjectId(), getLevel() - trasformedNpc.getLevel());
sendPacket(my);
sendPacket(new MyTargetSelected(trasformedNpc.getObjectId(), getLevel() - trasformedNpc.getLevel()));
// Send a Server->Client packet StatusUpdate of the NpcInstance to the PlayerInstance to update its HP bar
final StatusUpdate su = new StatusUpdate(trasformedNpc.getObjectId());

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java
View File

@@ -193,8 +193,7 @@ public abstract class Summon extends Playable
else if (player.getTarget() != this)
{
player.setTarget(this);
final MyTargetSelected my = new MyTargetSelected(getObjectId(), player.getLevel() - getLevel());
player.sendPacket(my);
player.sendPacket(new MyTargetSelected(getObjectId(), player.getLevel() - getLevel()));
// update status hp and mp
final StatusUpdate su = new StatusUpdate(getObjectId());

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ArtefactInstance.java
View File

@@ -94,8 +94,7 @@ public class ArtefactInstance extends NpcInstance
player.setTarget(this);
// Send a Server->Client packet MyTargetSelected to the PlayerInstance player
final MyTargetSelected my = new MyTargetSelected(getObjectId(), 0);
player.sendPacket(my);
player.sendPacket(new MyTargetSelected(getObjectId(), 0));
// Send a Server->Client packet ValidateLocation to correct the ArtefactInstance position and heading on the client
player.sendPacket(new ValidateLocation(this));

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/AuctioneerInstance.java
View File

@@ -66,8 +66,7 @@ public class AuctioneerInstance extends FolkInstance
player.setTarget(this);
// Send a Server->Client packet MyTargetSelected to the PlayerInstance player
final MyTargetSelected my = new MyTargetSelected(getObjectId(), 0);
player.sendPacket(my);
player.sendPacket(new MyTargetSelected(getObjectId(), 0));
// Send a Server->Client packet ValidateLocation to correct the NpcInstance position and heading on the client
player.sendPacket(new ValidateLocation(this));

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CabaleBufferInstance.java
View File

@@ -53,8 +53,7 @@ public class CabaleBufferInstance extends NpcInstance
// Send a Server->Client packet MyTargetSelected to the PlayerInstance player
// The color to display in the select window is White
final MyTargetSelected my = new MyTargetSelected(getObjectId(), 0);
player.sendPacket(my);
player.sendPacket(new MyTargetSelected(getObjectId(), 0));
// Send a Server->Client packet ValidateLocation to correct the ArtefactInstance position and heading on the client
player.sendPacket(new ValidateLocation(this));

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleBlacksmithInstance.java
View File

@@ -53,8 +53,7 @@ public class CastleBlacksmithInstance extends FolkInstance
player.setTarget(this);
// Send a Server->Client packet MyTargetSelected to the PlayerInstance player
final MyTargetSelected my = new MyTargetSelected(getObjectId(), 0);
player.sendPacket(my);
player.sendPacket(new MyTargetSelected(getObjectId(), 0));
// Send a Server->Client packet ValidateLocation to correct the NpcInstance position and heading on the client
player.sendPacket(new ValidateLocation(this));

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleChamberlainInstance.java
View File

@@ -74,8 +74,7 @@ public class CastleChamberlainInstance extends FolkInstance
player.setTarget(this);
// Send a Server->Client packet MyTargetSelected to the PlayerInstance player
final MyTargetSelected my = new MyTargetSelected(getObjectId(), 0);
player.sendPacket(my);
player.sendPacket(new MyTargetSelected(getObjectId(), 0));
// Send a Server->Client packet ValidateLocation to correct the NpcInstance position and heading on the client
player.sendPacket(new ValidateLocation(this));
@@ -292,8 +291,7 @@ public class CastleChamberlainInstance extends FolkInstance
final StoreTradeList list = TradeController.getInstance().getBuyList(buy);
if ((list != null) && list.getNpcId().equals(String.valueOf(getNpcId())))
{
final BuyList bl = new BuyList(list, player.getAdena(), 0);
player.sendPacket(bl);
player.sendPacket(new BuyList(list, player.getAdena(), 0));
}
else
{

9
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManagerInstance.java
View File

@@ -917,8 +917,7 @@ public class ClanHallManagerInstance extends FolkInstance
player.setTarget(this);
// Send a Server->Client packet MyTargetSelected to the PlayerInstance player
final MyTargetSelected my = new MyTargetSelected(getObjectId(), 0);
player.sendPacket(my);
player.sendPacket(new MyTargetSelected(getObjectId(), 0));
// Send a Server->Client packet ValidateLocation to correct the NpcInstance position and heading on the client
player.sendPacket(new ValidateLocation(this));
@@ -1092,8 +1091,7 @@ public class ClanHallManagerInstance extends FolkInstance
if ((list != null) && list.getNpcId().equals(String.valueOf(getNpcId())))
{
final BuyList bl = new BuyList(list, player.getAdena(), taxRate);
player.sendPacket(bl);
player.sendPacket(new BuyList(list, player.getAdena(), taxRate));
}
else
{
@@ -1110,7 +1108,6 @@ public class ClanHallManagerInstance extends FolkInstance
*/
private void revalidateDeco(PlayerInstance player)
{
final ClanHallDecoration bl = new ClanHallDecoration(ClanHallManager.getInstance().getClanHallByOwner(player.getClan()));
player.sendPacket(bl);
player.sendPacket(new ClanHallDecoration(ClanHallManager.getInstance().getClanHallByOwner(player.getClan())));
}
}

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallSiegeInfInstance.java
View File

@@ -56,8 +56,7 @@ public class ClanHallSiegeInfInstance extends NpcInstance
player.setTarget(this);
// Send a Server->Client packet MyTargetSelected to the PlayerInstance
final MyTargetSelected my = new MyTargetSelected(getObjectId(), 0);
player.sendPacket(my);
player.sendPacket(new MyTargetSelected(getObjectId(), 0));
// Send a Server->Client packet ValidateLocation to correct the NpcInstance position and heading on the client
player.sendPacket(new ValidateLocation(this));

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClassMasterInstance.java
View File

@@ -66,8 +66,7 @@ public class ClassMasterInstance extends FolkInstance
player.setTarget(this);
// Send a Server->Client packet MyTargetSelected to the PlayerInstance player
final MyTargetSelected my = new MyTargetSelected(getObjectId(), 0);
player.sendPacket(my);
player.sendPacket(new MyTargetSelected(getObjectId(), 0));
// Send a Server->Client packet ValidateLocation to correct the NpcInstance position and heading on the client
player.sendPacket(new ValidateLocation(this));

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ControlTowerInstance.java
View File

@@ -74,8 +74,7 @@ public class ControlTowerInstance extends NpcInstance
player.setTarget(this);
// Send a Server->Client packet MyTargetSelected to the PlayerInstance player
final MyTargetSelected my = new MyTargetSelected(getObjectId(), player.getLevel() - getLevel());
player.sendPacket(my);
player.sendPacket(new MyTargetSelected(getObjectId(), player.getLevel() - getLevel()));
// Send a Server->Client packet StatusUpdate of the NpcInstance to the PlayerInstance to update its HP bar
final StatusUpdate su = new StatusUpdate(getObjectId());

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CubicInstance.java
View File

@@ -621,8 +621,7 @@ public class CubicInstance
{
// Smart Cubic debuff cancel is needed, no other skill is used in this
// activation period
final MagicSkillUse msu = new MagicSkillUse(owner, owner, SKILL_CUBIC_CURE, 1, 0, 0);
owner.broadcastPacket(msu);
owner.broadcastPacket(new MagicSkillUse(owner, owner, SKILL_CUBIC_CURE, 1, 0, 0));
}
else if (Rnd.get(100) < _chance)
{
@@ -1067,8 +1066,7 @@ public class CubicInstance
skill.useSkill(_owner, targets);
}
final MagicSkillUse msu = new MagicSkillUse(_owner, target, skill.getId(), skill.getLevel(), 0, 0);
_owner.broadcastPacket(msu);
_owner.broadcastPacket(new MagicSkillUse(_owner, target, skill.getId(), skill.getLevel(), 0, 0));
}
}
}

9
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/DoorInstance.java
View File

@@ -532,8 +532,7 @@ public class DoorInstance extends Creature
player.setTarget(this);
// Send a Server->Client packet MyTargetSelected to the PlayerInstance player
final MyTargetSelected my = new MyTargetSelected(getObjectId(), 0);
player.sendPacket(my);
player.sendPacket(new MyTargetSelected(getObjectId(), 0));
final DoorStatusUpdate su = new DoorStatusUpdate(this);
player.sendPacket(su);
@@ -584,8 +583,7 @@ public class DoorInstance extends Creature
if (player.getAccessLevel().isGm())
{
player.setTarget(this);
final MyTargetSelected my = new MyTargetSelected(getObjectId(), player.getLevel());
player.sendPacket(my);
player.sendPacket(new MyTargetSelected(getObjectId(), player.getLevel()));
if (isAutoAttackable(player))
{
@@ -621,8 +619,7 @@ public class DoorInstance extends Creature
{
// ATTACK the mob without moving?
player.setTarget(this);
final MyTargetSelected my = new MyTargetSelected(getObjectId(), player.getLevel());
player.sendPacket(my);
player.sendPacket(new MyTargetSelected(getObjectId(), player.getLevel()));
if (isAutoAttackable(player))
{

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/DoormanInstance.java
View File

@@ -231,8 +231,7 @@ public class DoormanInstance extends FolkInstance
player.setTarget(this);
// Send a Server->Client packet MyTargetSelected to the PlayerInstance player
final MyTargetSelected my = new MyTargetSelected(getObjectId(), 0);
player.sendPacket(my);
player.sendPacket(new MyTargetSelected(getObjectId(), 0));
// Send a Server->Client packet ValidateLocation to correct the NpcInstance position and heading on the client
player.sendPacket(new ValidateLocation(this));

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FestivalMonsterInstance.java
View File

@@ -100,7 +100,6 @@ public class FestivalMonsterInstance extends MonsterInstance
public void doItemDrop(Creature lastAttacker)
{
PlayerInstance killingChar = null;
if (!(lastAttacker instanceof PlayerInstance))
{
return;
@@ -108,7 +107,6 @@ public class FestivalMonsterInstance extends MonsterInstance
killingChar = (PlayerInstance) lastAttacker;
final Party associatedParty = killingChar.getParty();
if (associatedParty == null)
{
return;
@@ -118,7 +116,6 @@ public class FestivalMonsterInstance extends MonsterInstance
final ItemInstance addedOfferings = partyLeader.getInventory().addItem("Sign", SevenSignsFestival.FESTIVAL_OFFERING_ID, _bonusMultiplier, partyLeader, this);
final InventoryUpdate iu = new InventoryUpdate();
if (addedOfferings.getCount() != _bonusMultiplier)
{
iu.addModifiedItem(addedOfferings);
@@ -127,7 +124,6 @@ public class FestivalMonsterInstance extends MonsterInstance
{
iu.addNewItem(addedOfferings);
}
partyLeader.sendPacket(iu);
super.doItemDrop(lastAttacker); // Normal drop

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java
View File

@@ -71,8 +71,7 @@ public class FishermanInstance extends FolkInstance
if ((list != null) && list.getNpcId().equals(String.valueOf(getNpcId())))
{
final BuyList bl = new BuyList(list, player.getAdena(), taxRate);
player.sendPacket(bl);
player.sendPacket(new BuyList(list, player.getAdena(), taxRate));
}
else
{

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FolkInstance.java
View File

@@ -128,8 +128,7 @@ public class FolkInstance extends NpcInstance
}
else
{
final SystemMessage sm = new SystemMessage(SystemMessageId.NO_MORE_SKILLS_TO_LEARN);
player.sendPacket(sm);
player.sendPacket(new SystemMessage(SystemMessageId.NO_MORE_SKILLS_TO_LEARN));
}
}
else

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortMerchantInstance.java
View File

@@ -51,8 +51,7 @@ public class FortMerchantInstance extends NpcWalkerInstance
player.setTarget(this);
// Send a Server->Client packet MyTargetSelected to the PlayerInstance player
final MyTargetSelected my = new MyTargetSelected(getObjectId(), 0);
player.sendPacket(my);
player.sendPacket(new MyTargetSelected(getObjectId(), 0));
// Send a Server->Client packet ValidateLocation to correct the NpcInstance position and heading on the client
player.sendPacket(new ValidateLocation(this));

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortSiegeGuardInstance.java
View File

@@ -140,8 +140,7 @@ public class FortSiegeGuardInstance extends Attackable
player.setTarget(this);
// Send a Server->Client packet MyTargetSelected to the PlayerInstance player
final MyTargetSelected my = new MyTargetSelected(getObjectId(), player.getLevel() - getLevel());
player.sendPacket(my);
player.sendPacket(new MyTargetSelected(getObjectId(), player.getLevel() - getLevel()));
// Send a Server->Client packet StatusUpdate of the NpcInstance to the PlayerInstance to update its HP bar
final StatusUpdate su = new StatusUpdate(getObjectId());

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/GrandBossInstance.java
View File

@@ -65,8 +65,7 @@ public class GrandBossInstance extends MonsterInstance
if (player != null)
{
final SystemMessage msg = new SystemMessage(SystemMessageId.RAID_WAS_SUCCESSFUL);
broadcastPacket(msg);
broadcastPacket(new SystemMessage(SystemMessageId.RAID_WAS_SUCCESSFUL));
if (player.getParty() != null)
{
for (PlayerInstance member : player.getParty().getPartyMembers())

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
View File

@@ -218,8 +218,7 @@ public class GuardInstance extends Attackable
// Send a Server->Client packet MyTargetSelected to the PlayerInstance player
// The color to display in the select window is White
final MyTargetSelected my = new MyTargetSelected(getObjectId(), 0);
player.sendPacket(my);
player.sendPacket(new MyTargetSelected(getObjectId(), 0));
// Send a Server->Client packet ValidateLocation to correct the NpcInstance position and heading on the client
player.sendPacket(new ValidateLocation(this));
@@ -239,8 +238,7 @@ public class GuardInstance extends Attackable
{
// Send a Server->Client packet SocialAction to the all PlayerInstance on the _knownPlayer of the NpcInstance
// to display a social action of the GuardInstance on their client
final SocialAction sa = new SocialAction(getObjectId(), Rnd.get(8));
broadcastPacket(sa);
broadcastPacket(new SocialAction(getObjectId(), Rnd.get(8)));
// Open a chat window on client with the text of the GuardInstance
showChatWindow(player, 0);

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/GuardNoHTMLInstance.java
View File

@@ -183,8 +183,7 @@ public class GuardNoHTMLInstance extends Attackable
// Set the target of the PlayerInstance player
player.setTarget(this);
// Send a Server->Client packet MyTargetSelected to the PlayerInstance player The color to display in the select window is White
final MyTargetSelected my = new MyTargetSelected(getObjectId(), 0);
player.sendPacket(my);
player.sendPacket(new MyTargetSelected(getObjectId(), 0));
// Send a Server->Client packet ValidateLocation to correct the NpcInstance position and heading on the client
player.sendPacket(new ValidateLocation(this));
}

9
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ManorManagerInstance.java
View File

@@ -64,8 +64,7 @@ public class ManorManagerInstance extends MerchantInstance
player.setTarget(this);
// Send a Server->Client packet MyTargetSelected to the PlayerInstance player
final MyTargetSelected my = new MyTargetSelected(getObjectId(), 0);
player.sendPacket(my);
player.sendPacket(new MyTargetSelected(getObjectId(), 0));
// Send a Server->Client packet ValidateLocation to correct the NpcInstance position and heading on the client
player.sendPacket(new ValidateLocation(this));
@@ -111,8 +110,7 @@ public class ManorManagerInstance extends MerchantInstance
if (list != null)
{
list.getItems().get(0).setCount(1);
final BuyList bl = new BuyList(list, player.getAdena(), taxRate);
player.sendPacket(bl);
player.sendPacket(new BuyList(list, player.getAdena(), taxRate));
}
else
{
@@ -186,8 +184,7 @@ public class ManorManagerInstance extends MerchantInstance
tradeList.addItem(item);
}
}
final BuyListSeed bl = new BuyListSeed(tradeList, castleId, player.getAdena());
player.sendPacket(bl);
player.sendPacket(new BuyListSeed(tradeList, castleId, player.getAdena()));
}
break;
}

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MercManagerInstance.java
View File

@@ -56,8 +56,7 @@ public class MercManagerInstance extends FolkInstance
player.setTarget(this);
// Send a Server->Client packet MyTargetSelected to the PlayerInstance player
final MyTargetSelected my = new MyTargetSelected(getObjectId(), 0);
player.sendPacket(my);
player.sendPacket(new MyTargetSelected(getObjectId(), 0));
// Send a Server->Client packet ValidateLocation to correct the NpcInstance position and heading on the client
player.sendPacket(new ValidateLocation(this));
@@ -120,8 +119,7 @@ public class MercManagerInstance extends FolkInstance
final StoreTradeList list = TradeController.getInstance().getBuyList(value);
if ((list != null) && list.getNpcId().equals(String.valueOf(getNpcId())))
{
final BuyList bl = new BuyList(list, player.getAdena(), 0);
player.sendPacket(bl);
player.sendPacket(new BuyList(list, player.getAdena(), 0));
}
else
{

9
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MerchantInstance.java
View File

@@ -74,8 +74,7 @@ public class MerchantInstance extends FolkInstance
if (list != null)
{
final WearList bl = new WearList(list, player.getAdena(), player.getExpertiseIndex());
player.sendPacket(bl);
player.sendPacket(new WearList(list, player.getAdena(), player.getExpertiseIndex()));
}
else
{
@@ -103,8 +102,7 @@ public class MerchantInstance extends FolkInstance
final StoreTradeList list = TradeController.getInstance().getBuyList(value);
if ((list != null) && list.getNpcId().equals(String.valueOf(getNpcId())))
{
final BuyList bl = new BuyList(list, player.getAdena(), taxRate);
player.sendPacket(bl);
player.sendPacket(new BuyList(list, player.getAdena(), taxRate));
}
else
{
@@ -299,8 +297,7 @@ public class MerchantInstance extends FolkInstance
{
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(player))
{

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
View File

@@ -143,8 +143,7 @@ public class MonsterInstance extends Attackable
{
case 12372: // baium
{
final SocialAction sa = new SocialAction(getObjectId(), 2);
broadcastPacket(sa);
broadcastPacket(new SocialAction(getObjectId(), 2));
}
}
}

24
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java
View File

@@ -683,8 +683,7 @@ public class NpcInstance extends Creature
{
// Send a Server->Client packet MyTargetSelected to the PlayerInstance player
// The player.getLevel() - getLevel() permit to display the correct color in the select window
final MyTargetSelected my = new MyTargetSelected(getObjectId(), player.getLevel() - getLevel());
player.sendPacket(my);
player.sendPacket(new MyTargetSelected(getObjectId(), player.getLevel() - getLevel()));
// Send a Server->Client packet StatusUpdate of the NpcInstance to the PlayerInstance to update its HP bar
final StatusUpdate su = new StatusUpdate(getObjectId());
@@ -695,8 +694,7 @@ public class NpcInstance extends Creature
else
{
// Send a Server->Client packet MyTargetSelected to the PlayerInstance player
final MyTargetSelected my = new MyTargetSelected(getObjectId(), 0);
player.sendPacket(my);
player.sendPacket(new MyTargetSelected(getObjectId(), 0));
}
player.setTimerToAttack(System.currentTimeMillis());
@@ -740,8 +738,7 @@ public class NpcInstance extends Creature
}
// Send a Server->Client packet SocialAction to the all PlayerInstance on the _knownPlayer of the NpcInstance to display a social action of the NpcInstance on their client
final SocialAction sa = new SocialAction(getObjectId(), Rnd.get(8));
broadcastPacket(sa);
broadcastPacket(new SocialAction(getObjectId(), Rnd.get(8)));
// Open a chat window on client with the text of the NpcInstance
if (isEventMob)
{
@@ -839,8 +836,7 @@ public class NpcInstance extends Creature
// Send a Server->Client packet MyTargetSelected to the PlayerInstance player
// The player.getLevel() - getLevel() permit to display the correct color in the select window
final MyTargetSelected my = new MyTargetSelected(getObjectId(), player.getLevel() - getLevel());
player.sendPacket(my);
player.sendPacket(new MyTargetSelected(getObjectId(), player.getLevel() - getLevel()));
// Check if the player is attackable (without a forced attack)
if (isAutoAttackable(player))
@@ -910,8 +906,7 @@ public class NpcInstance extends Creature
// Send a Server->Client packet MyTargetSelected to the PlayerInstance player
// The player.getLevel() - getLevel() permit to display the correct color in the select window
final MyTargetSelected my = new MyTargetSelected(getObjectId(), player.getLevel() - getLevel());
player.sendPacket(my);
player.sendPacket(new MyTargetSelected(getObjectId(), player.getLevel() - getLevel()));
// Check if the player is attackable (without a forced attack)
if (isAutoAttackable(player))
@@ -996,8 +991,7 @@ public class NpcInstance extends Creature
{
// Send a Server->Client packet MyTargetSelected to the PlayerInstance player
// The player.getLevel() - getLevel() permit to display the correct color in the select window
final MyTargetSelected my = new MyTargetSelected(getObjectId(), player.getLevel() - getLevel());
player.sendPacket(my);
player.sendPacket(new MyTargetSelected(getObjectId(), player.getLevel() - getLevel()));
// Send a Server->Client packet StatusUpdate of the NpcInstance to the PlayerInstance to update its HP bar
final StatusUpdate su = new StatusUpdate(getObjectId());
@@ -1008,8 +1002,7 @@ public class NpcInstance extends Creature
else
{
// Send a Server->Client packet MyTargetSelected to the PlayerInstance player
final MyTargetSelected my = new MyTargetSelected(getObjectId(), 0);
player.sendPacket(my);
player.sendPacket(new MyTargetSelected(getObjectId(), 0));
}
player.setTimerToAttack(System.currentTimeMillis());
@@ -1071,8 +1064,7 @@ public class NpcInstance extends Creature
}
// Send a Server->Client packet SocialAction to the all PlayerInstance on the _knownPlayer of the NpcInstance to display a social action of the NpcInstance on their client
final SocialAction sa = new SocialAction(getObjectId(), Rnd.get(8));
broadcastPacket(sa);
broadcastPacket(new SocialAction(getObjectId(), Rnd.get(8)));
// Open a chat window on client with the text of the NpcInstance
if (isEventMob)
{

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ObservationInstance.java
View File

@@ -128,8 +128,7 @@ public class ObservationInstance extends FolkInstance
{
// enter mode
player.enterObserverMode(x, y, z);
final ItemList il = new ItemList(player, false);
player.sendPacket(il);
player.sendPacket(new ItemList(player, false));
}
player.sendPacket(ActionFailed.STATIC_PACKET);

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PenaltyMonsterInstance.java
View File

@@ -58,8 +58,7 @@ public class PenaltyMonsterInstance extends MonsterInstance
{
if (Rnd.get(100) <= 80)
{
final CreatureSay cs = new CreatureSay(getObjectId(), Say2.ALL, getName(), "mmm your bait was delicious");
broadcastPacket(cs);
broadcastPacket(new CreatureSay(getObjectId(), Say2.ALL, getName(), "mmm your bait was delicious"));
}
_ptk = ptk;
addDamageHate(ptk, 10, 10);
@@ -77,8 +76,7 @@ public class PenaltyMonsterInstance extends MonsterInstance
if (Rnd.get(100) <= 75)
{
final CreatureSay cs = new CreatureSay(getObjectId(), Say2.ALL, getName(), "I will tell fishes not to take your bait");
broadcastPacket(cs);
broadcastPacket(new CreatureSay(getObjectId(), Say2.ALL, getName(), "I will tell fishes not to take your bait"));
}
return true;
}

9
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
View File

@@ -286,8 +286,7 @@ public class PetInstance extends Summon
else
{
player.setTarget(this);
final MyTargetSelected my = new MyTargetSelected(getObjectId(), player.getLevel() - getLevel());
player.sendPacket(my);
player.sendPacket(new MyTargetSelected(getObjectId(), player.getLevel() - getLevel()));
}
}
@@ -553,8 +552,7 @@ public class PetInstance extends Summon
_inventory.addItem("Pickup", target, getOwner(), this);
// FIXME Just send the updates if possible (old way wasn't working though)
final PetItemList iu = new PetItemList(this);
getOwner().sendPacket(iu);
getOwner().sendPacket(new PetItemList(this));
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
@@ -716,10 +714,9 @@ public class PetInstance extends Summon
{
getInventory().transferItem("PetTransfer", item.getObjectId(), item.getCount(), getOwner().getInventory(), getOwner(), this);
final PetInventoryUpdate petiu = new PetInventoryUpdate();
final ItemList playerUI = new ItemList(getOwner(), false);
petiu.addRemovedItem(item);
getOwner().sendPacket(petiu);
getOwner().sendPacket(playerUI);
getOwner().sendPacket(new ItemList(getOwner(), false));
}
catch (Exception e)
{

72
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@@ -1962,8 +1962,7 @@ public class PlayerInstance extends Playable
return;
}
_lastCompassZone = ExSetCompassZoneCode.SIEGEWARZONE2;
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.SIEGEWARZONE2);
sendPacket(cz);
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.SIEGEWARZONE2));
}
else if (isInsideZone(ZoneId.PVP))
{
@@ -1972,8 +1971,7 @@ public class PlayerInstance extends Playable
return;
}
_lastCompassZone = ExSetCompassZoneCode.PVPZONE;
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.PVPZONE);
sendPacket(cz);
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.PVPZONE));
}
else if (isIn7sDungeon())
{
@@ -1982,8 +1980,7 @@ public class PlayerInstance extends Playable
return;
}
_lastCompassZone = ExSetCompassZoneCode.SEVENSIGNSZONE;
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.SEVENSIGNSZONE);
sendPacket(cz);
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.SEVENSIGNSZONE));
}
else if (isInsideZone(ZoneId.PEACE))
{
@@ -1992,8 +1989,7 @@ public class PlayerInstance extends Playable
return;
}
_lastCompassZone = ExSetCompassZoneCode.PEACEZONE;
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.PEACEZONE);
sendPacket(cz);
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.PEACEZONE));
}
else
{
@@ -2006,8 +2002,7 @@ public class PlayerInstance extends Playable
updatePvPStatus();
}
_lastCompassZone = ExSetCompassZoneCode.GENERALZONE;
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.GENERALZONE);
sendPacket(cz);
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.GENERALZONE));
}
}
@@ -4243,8 +4238,7 @@ public class PlayerInstance extends Playable
sendPacket(su);
// Send the ItemList Server->Client Packet to the player in order to refresh its Inventory
final ItemList il = new ItemList(getInventory().getItems(), true);
sendPacket(il);
sendPacket(new ItemList(getInventory().getItems(), true));
// Send a Server->Client packet UserInfo to this PlayerInstance and CharInfo to all PlayerInstance in its _KnownPlayers
broadcastUserInfo();
@@ -4280,7 +4274,6 @@ public class PlayerInstance extends Playable
if (!Config.FORCE_INVENTORY_UPDATE)
{
final InventoryUpdate playerIU = new InventoryUpdate();
if ((oldItem.getCount() > 0) && (oldItem != newItem))
{
playerIU.addModifiedItem(oldItem);
@@ -4289,7 +4282,6 @@ public class PlayerInstance extends Playable
{
playerIU.addRemovedItem(oldItem);
}
sendPacket(playerIU);
}
else
@@ -4310,7 +4302,6 @@ public class PlayerInstance extends Playable
if (!Config.FORCE_INVENTORY_UPDATE)
{
final InventoryUpdate playerIU = new InventoryUpdate();
if (newItem.getCount() > count)
{
playerIU.addModifiedItem(newItem);
@@ -4319,7 +4310,6 @@ public class PlayerInstance extends Playable
{
playerIU.addNewItem(newItem);
}
targetPlayer.sendPacket(playerIU);
}
else
@@ -4335,7 +4325,6 @@ public class PlayerInstance extends Playable
else if (target instanceof PetInventory)
{
final PetInventoryUpdate petIU = new PetInventoryUpdate();
if (newItem.getCount() > count)
{
petIU.addModifiedItem(newItem);
@@ -4344,7 +4333,6 @@ public class PlayerInstance extends Playable
{
petIU.addNewItem(newItem);
}
((PetInventory) target).getOwner().getOwner().sendPacket(petIU);
}
@@ -4362,27 +4350,22 @@ public class PlayerInstance extends Playable
*/
public boolean dropItem(String process, ItemInstance item, WorldObject reference, boolean sendMessage, boolean protectItem)
{
if (_freight.getItemByObjectId(item.getObjectId()) != null)
{
// Send a Server->Client ActionFailed to the PlayerInstance in order to avoid that the client wait another packet
sendPacket(ActionFailed.STATIC_PACKET);
Util.handleIllegalPlayerAction(this, "Warning!! Character " + getName() + " of account " + getAccountName() + " tried to drop Freight Items", IllegalPlayerAction.PUNISH_KICK);
return false;
}
item = _inventory.dropItem(process, item, this, reference);
if (item == null)
{
if (sendMessage)
{
sendPacket(SystemMessageId.NOT_ENOUGH_ITEMS);
}
return false;
}
@@ -4390,7 +4373,6 @@ public class PlayerInstance extends Playable
if (Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(item.getItemId()))
{
if (Config.AUTODESTROY_ITEM_AFTER > 0) // autodestroy enabled
{
if ((item.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM) || !item.isEquipable())
@@ -4402,18 +4384,15 @@ public class PlayerInstance extends Playable
{
item.setProtected(true);
}
}
else
{
item.setProtected(true);
}
}
else
{
item.setProtected(true);
}
if (protectItem)
@@ -5316,8 +5295,7 @@ public class PlayerInstance extends Playable
if (isInParty() && (needCpUpdate(352) || super.needHpUpdate(352) || needMpUpdate(352)))
{
// Send the Server->Client packet PartySmallWindowUpdate with current HP, MP and Level to all other PlayerInstance of the Party
final PartySmallWindowUpdate update = new PartySmallWindowUpdate(this);
getParty().broadcastToPartyMembers(this, update);
getParty().broadcastToPartyMembers(this, new PartySmallWindowUpdate(this));
}
if (isInOlympiadMode())
@@ -5344,8 +5322,7 @@ public class PlayerInstance extends Playable
}
if (isInDuel())
{
final ExDuelUpdateUserInfo update = new ExDuelUpdateUserInfo(this);
DuelManager.getInstance().broadcastToOppositTeam(this, update);
DuelManager.getInstance().broadcastToOppositTeam(this, new ExDuelUpdateUserInfo(this));
}
}
@@ -6260,11 +6237,10 @@ public class PlayerInstance extends Playable
{
if (!(pk._teamNameTvT.equals(_teamNameTvT)))
{
final PlaySound ps = new PlaySound(0, "ItemSound.quest_itemget", this);
_countTvTdies++;
pk._countTvTkills++;
pk.setTitle("Kills: " + pk._countTvTkills);
pk.sendPacket(ps);
pk.sendPacket(new PlaySound(0, "ItemSound.quest_itemget", this));
pk.broadcastUserInfo();
TvT.setTeamKillsCount(pk._teamNameTvT, TvT.teamKillsCount(pk._teamNameTvT) + 1);
pk.broadcastUserInfo();
@@ -6315,9 +6291,8 @@ public class PlayerInstance extends Playable
if (DM.isTeleport() || DM.hasStarted())
{
pk._countDMkills++;
final PlaySound ps = new PlaySound(0, "ItemSound.quest_itemget", this);
pk.setTitle("Kills: " + pk._countDMkills);
pk.sendPacket(ps);
pk.sendPacket(new PlaySound(0, "ItemSound.quest_itemget", this));
pk.broadcastUserInfo();
if (Config.DM_ENABLE_KILL_REWARD)
@@ -6761,10 +6736,8 @@ public class PlayerInstance extends Playable
*/
private boolean checkAntiFarm(PlayerInstance targetPlayer)
{
if (Config.ANTI_FARM_ENABLED)
{
// Anti FARM Clan - Ally
if ((Config.ANTI_FARM_CLAN_ALLY_ENABLED && ((getClanId() > 0) && (targetPlayer.getClanId() > 0) && (getClanId() == targetPlayer.getClanId()))) || ((getAllyId() > 0) && (targetPlayer.getAllyId() > 0) && (getAllyId() == targetPlayer.getAllyId())))
{
@@ -6834,7 +6807,6 @@ public class PlayerInstance extends Playable
{
if (targetPlayer.getClient().getConnection().getInetAddress() != _client.getConnection().getInetAddress())
{
if ((targetPlayer.getKarma() > 0) || (targetPlayer.getPvpFlag() > 0)) // killing target pk or in pvp
{
if (Config.PVP_REWARD_ENABLED)
@@ -7993,8 +7965,7 @@ public class PlayerInstance extends Playable
getInventory().setPaperdollItem(Inventory.PAPERDOLL_LHAND, _arrowItem);
// Send a Server->Client packet ItemList to this PlayerInstance to update left hand equipement
final ItemList il = new ItemList(this, false);
sendPacket(il);
sendPacket(new ItemList(this, false));
}
}
else
@@ -8338,10 +8309,9 @@ public class PlayerInstance extends Playable
enableAllSkills();
// Send a Server->Client Packet MagicSkillCanceld to the PlayerInstance and all PlayerInstance in the _KnownPlayers of the Creature (broadcast)
final MagicSkillCanceld msc = new MagicSkillCanceld(getObjectId());
// Broadcast the packet to self and known players.
Broadcast.toSelfAndKnownPlayersInRadius(this, msc, 810000/* 900 */);
Broadcast.toSelfAndKnownPlayersInRadius(this, new MagicSkillCanceld(getObjectId()), 810000/* 900 */);
}
/**
@@ -11271,8 +11241,7 @@ public class PlayerInstance extends Playable
_mountType = mountType;
// Send a Server->Client packet InventoryUpdate to the PlayerInstance in order to update speed
final UserInfo ui = new UserInfo(this);
sendPacket(ui);
sendPacket(new UserInfo(this));
return true;
}
@@ -11603,8 +11572,7 @@ public class PlayerInstance extends Playable
{
if (isOnline() == 1)
{
final SystemMessage msg = new SystemMessage(SystemMessageId.PLAYING_FOR_LONG_TIME);
PlayerInstance.this.sendPacket(msg);
sendPacket(new SystemMessage(SystemMessageId.PLAYING_FOR_LONG_TIME));
}
else
{
@@ -15261,8 +15229,7 @@ public class PlayerInstance extends Playable
*/
public void endFishing(boolean win)
{
final ExFishingEnd efe = new ExFishingEnd(win, this);
broadcastPacket(efe);
broadcastPacket(new ExFishingEnd(win, this));
_fishing = false;
_fishX = 0;
_fishY = 0;
@@ -15933,8 +15900,7 @@ public class PlayerInstance extends Playable
{
removeSkill(SkillTable.getInstance().getInfo(4289, 1));
}
final Ride dismount = new Ride(getObjectId(), Ride.ACTION_DISMOUNT, 0);
broadcastPacket(dismount);
broadcastPacket(new Ride(getObjectId(), Ride.ACTION_DISMOUNT, 0));
setMountObjectID(0);
broadcastUserInfo();
return true;
@@ -15976,8 +15942,7 @@ public class PlayerInstance extends Playable
*/
public void updatePcBangWnd(int score, boolean add, boolean duble)
{
final ExPCCafePointInfo wnd = new ExPCCafePointInfo(this, score, add, 24, duble);
sendPacket(wnd);
sendPacket(new ExPCCafePointInfo(this, score, add, 24, duble));
}
/**
@@ -15985,8 +15950,7 @@ public class PlayerInstance extends Playable
*/
public void showPcBangWindow()
{
final ExPCCafePointInfo wnd = new ExPCCafePointInfo(this, 0, false, 24, false);
sendPacket(wnd);
sendPacket(new ExPCCafePointInfo(this, 0, false, 24, false));
}
/**

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/RaceManagerInstance.java
View File

@@ -224,10 +224,8 @@ public class RaceManagerInstance extends NpcInstance
final MonsterRace race = MonsterRace.getInstance();
if (_state == STARTING_RACE)
{
final PlaySound sRace = new PlaySound(1, "S_Race");
broadcast(sRace);
final PlaySound sRace2 = new PlaySound(0, "ItemSound2.race_start", true, 121209259, new Location(12125, 182487, -3559), 0);
broadcast(sRace2);
broadcast(new PlaySound(1, "S_Race"));
broadcast(new PlaySound(0, "ItemSound2.race_start", true, 121209259, new Location(12125, 182487, -3559), 0));
_packet = new MonRaceInfo(_codes[1][0], _codes[1][1], race.getMonsters(), race.getSpeeds());
sendMonsterInfo();

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/RaidBossInstance.java
View File

@@ -81,8 +81,7 @@ public class RaidBossInstance extends MonsterInstance
if (player != null)
{
final SystemMessage msg = new SystemMessage(SystemMessageId.RAID_WAS_SUCCESSFUL);
broadcastPacket(msg);
broadcastPacket(new SystemMessage(SystemMessageId.RAID_WAS_SUCCESSFUL));
if (player.getParty() != null)
{
for (PlayerInstance member : player.getParty().getPartyMembers())

9
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpcInstance.java
View File

@@ -116,8 +116,7 @@ public class SepulcherNpcInstance extends NpcInstance
{
// Send a Server->Client packet MyTargetSelected to the PlayerInstance player
// The player.getLevel() - getLevel() permit to display the correct color in the select window
final MyTargetSelected my = new MyTargetSelected(getObjectId(), player.getLevel() - getLevel());
player.sendPacket(my);
player.sendPacket(new MyTargetSelected(getObjectId(), player.getLevel() - getLevel()));
// Send a Server->Client packet StatusUpdate of the NpcInstance to the PlayerInstance to update its HP bar
final StatusUpdate su = new StatusUpdate(getObjectId());
@@ -128,8 +127,7 @@ public class SepulcherNpcInstance extends NpcInstance
else
{
// Send a Server->Client packet MyTargetSelected to the PlayerInstance player
final MyTargetSelected my = new MyTargetSelected(getObjectId(), 0);
player.sendPacket(my);
player.sendPacket(new MyTargetSelected(getObjectId(), 0));
}
// Send a Server->Client packet ValidateLocation to correct the NpcInstance position and heading on the client
@@ -164,8 +162,7 @@ public class SepulcherNpcInstance extends NpcInstance
else
{
// Send a Server->Client packet SocialAction to the all PlayerInstance on the _knownPlayer of the NpcInstance to display a social action of the NpcInstance on their client
final SocialAction sa = new SocialAction(getObjectId(), Rnd.get(8));
broadcastPacket(sa);
broadcastPacket(new SocialAction(getObjectId(), Rnd.get(8)));
doAction(player);
}

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java
View File

@@ -107,8 +107,7 @@ public class SiegeFlagInstance extends NpcInstance
player.setTarget(this);
// Send a Server->Client packet MyTargetSelected to the PlayerInstance player
final MyTargetSelected my = new MyTargetSelected(getObjectId(), player.getLevel() - getLevel());
player.sendPacket(my);
player.sendPacket(new MyTargetSelected(getObjectId(), player.getLevel() - getLevel()));
// Send a Server->Client packet StatusUpdate of the NpcInstance to the PlayerInstance to update its HP bar
final StatusUpdate su = new StatusUpdate(getObjectId());

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SiegeGuardInstance.java
View File

@@ -145,8 +145,7 @@ public class SiegeGuardInstance extends Attackable
player.setTarget(this);
// Send a Server->Client packet MyTargetSelected to the PlayerInstance player
final MyTargetSelected my = new MyTargetSelected(getObjectId(), player.getLevel() - getLevel());
player.sendPacket(my);
player.sendPacket(new MyTargetSelected(getObjectId(), player.getLevel() - getLevel()));
// Send a Server->Client packet StatusUpdate of the NpcInstance to the PlayerInstance to update its HP bar
final StatusUpdate su = new StatusUpdate(getObjectId());

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SiegeNpcInstance.java
View File

@@ -50,8 +50,7 @@ public class SiegeNpcInstance extends FolkInstance
player.setTarget(this);
// Send a Server->Client packet MyTargetSelected to the PlayerInstance player
final MyTargetSelected my = new MyTargetSelected(getObjectId(), 0);
player.sendPacket(my);
player.sendPacket(new MyTargetSelected(getObjectId(), 0));
player.sendPacket(new ValidateLocation(this));
}

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/StaticObjectInstance.java
View File

@@ -139,8 +139,7 @@ public class StaticObjectInstance extends WorldObject
}
else
{
final MyTargetSelected my = new MyTargetSelected(getObjectId(), 0);
player.sendPacket(my);
player.sendPacket(new MyTargetSelected(getObjectId(), 0));
// Calculate the distance between the PlayerInstance and the NpcInstance
if (!player.isInsideRadius(this, INTERACTION_DISTANCE, false, false))

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SummonInstance.java
View File

@@ -178,7 +178,6 @@ public class SummonInstance extends Summon
{
super.reduceCurrentHp(damage, attacker);
final SystemMessage sm = new SystemMessage(SystemMessageId.SUMMON_RECEIVED_DAMAGE_S2_BY_S1);
if (attacker instanceof NpcInstance)
{
sm.addNpcName(((NpcInstance) attacker).getTemplate().getNpcId());
@@ -187,7 +186,6 @@ public class SummonInstance extends Summon
{
sm.addString(attacker.getName());
}
sm.addNumber(damage);
getOwner().sendPacket(sm);
}

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TownPetInstance.java
View File

@@ -57,8 +57,7 @@ public class TownPetInstance extends NpcInstance
// Send a Server->Client packet MyTargetSelected to the PlayerInstance player
// The color to display in the select window is White
final MyTargetSelected my = new MyTargetSelected(getObjectId(), 0);
player.sendPacket(my);
player.sendPacket(new MyTargetSelected(getObjectId(), 0));
// Send a Server->Client packet ValidateLocation to correct the ArtefactInstance position and heading on the client
player.sendPacket(new ValidateLocation(this));

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/WarehouseInstance.java
View File

@@ -104,8 +104,7 @@ public class WarehouseInstance extends FolkInstance
player.setActiveWarehouse(player.getClan().getWarehouse());
player.tempInvetoryDisable();
final WareHouseDepositList dl = new WareHouseDepositList(player, WareHouseDepositList.CLAN);
player.sendPacket(dl);
player.sendPacket(new WareHouseDepositList(player, WareHouseDepositList.CLAN));
}
}
}

5
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/WyvernManagerInstance.java
View File

@@ -77,7 +77,7 @@ public class WyvernManagerInstance extends CastleChamberlainInstance
if (player.getPet().getLevel() < 55)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2);
sm.addString("Your Strider Has not reached the required level.");
sm.addString("Your strider has not reached the required level.");
player.sendPacket(sm);
}
else
@@ -133,8 +133,7 @@ public class WyvernManagerInstance extends CastleChamberlainInstance
player.setTarget(this);
// Send a Server->Client packet MyTargetSelected to the PlayerInstance player
final MyTargetSelected my = new MyTargetSelected(getObjectId(), 0);
player.sendPacket(my);
player.sendPacket(new MyTargetSelected(getObjectId(), 0));
// Send a Server->Client packet ValidateLocation to correct the NpcInstance position and heading on the client
player.sendPacket(new ValidateLocation(this));

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/XmassTreeInstance.java
View File

@@ -62,8 +62,7 @@ public class XmassTreeInstance extends NpcInstance
setTarget(player);
doCast(skill);
final MagicSkillUse msu = new MagicSkillUse(_caster, player, skill.getId(), 1, skill.getHitTime(), 0);
broadcastPacket(msu);
broadcastPacket(new MagicSkillUse(_caster, player, skill.getId(), 1, skill.getHitTime(), 0));
return true;
}
return false;

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/status/PetStatus.java
View File

@@ -51,7 +51,6 @@ public class PetStatus extends SummonStatus
if (attacker != null)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.PET_RECEIVED_S2_DAMAGE_BY_S1);
if (attacker instanceof NpcInstance)
{
sm.addNpcName(((NpcInstance) attacker).getTemplate().getIdTemplate());
@@ -60,7 +59,6 @@ public class PetStatus extends SummonStatus
{
sm.addString(attacker.getName());
}
sm.addNumber((int) value);
getActiveChar().getOwner().sendPacket(sm);

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
View File

@@ -152,7 +152,6 @@ public class PlayerStatus extends PlayableStatus
{
// Send a System Message to the PlayerInstance
final SystemMessage smsg = new SystemMessage(SystemMessageId.S1_GAVE_YOU_S2_DMG);
if (attacker instanceof NpcInstance)
{
smsg.addNpcName(((NpcInstance) attacker).getTemplate().getIdTemplate());
@@ -165,7 +164,6 @@ public class PlayerStatus extends PlayableStatus
{
smsg.addString(attacker.getName());
}
smsg.addNumber(fullValue);
getActiveChar().sendPacket(smsg);
}

10
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java
View File

@@ -1477,9 +1477,7 @@ public class Clan
// Order of Knights 10000 points per each
if ((pledgeType != -1) && (((_reputationScore < 5000) && (pledgeType < SUBUNIT_KNIGHT1)) || ((_reputationScore < 10000) && (pledgeType > SUBUNIT_ROYAL2))))
{
final SystemMessage sp = new SystemMessage(SystemMessageId.THE_CLAN_REPUTATION_SCORE_IS_TOO_LOW);
player.sendPacket(sp);
player.sendPacket(new SystemMessage(SystemMessageId.THE_CLAN_REPUTATION_SCORE_IS_TOO_LOW));
return null;
}
@@ -2294,8 +2292,7 @@ public class Clan
if (!increaseClanLevel)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.FAILED_TO_INCREASE_CLAN_LEVEL);
player.sendPacket(sm);
player.sendPacket(new SystemMessage(SystemMessageId.FAILED_TO_INCREASE_CLAN_LEVEL));
return;
}
@@ -2304,8 +2301,7 @@ public class Clan
su.addAttribute(StatusUpdate.SP, player.getSp());
player.sendPacket(su);
final ItemList il = new ItemList(player, false);
player.sendPacket(il);
player.sendPacket(new ItemList(player, false));
changeLevel(_level + 1);
}

7
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/Announcements.java
View File

@@ -73,8 +73,7 @@ public class Announcements
{
for (String _announcement : _announcements)
{
final CreatureSay cs = new CreatureSay(0, Say2.ANNOUNCEMENT, player.getName(), _announcement.replace("%name%", player.getName()));
player.sendPacket(cs);
player.sendPacket(new CreatureSay(0, Say2.ANNOUNCEMENT, player.getName(), _announcement.replace("%name%", player.getName())));
}
for (List<Object> entry : _eventAnnouncements)
@@ -86,12 +85,10 @@ public class Announcements
if (!validDateRange.isValid() || validDateRange.isWithinRange(currentDate))
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2);
for (String element : msg)
{
sm.addString(element);
}
player.sendPacket(sm);
}
}
@@ -229,7 +226,6 @@ public class Announcements
public void announceToAll(String text)
{
final CreatureSay cs = new CreatureSay(0, Say2.ANNOUNCEMENT, "", text);
for (PlayerInstance player : World.getInstance().getAllPlayers())
{
player.sendPacket(cs);
@@ -241,7 +237,6 @@ public class Announcements
public void gameAnnounceToAll(String text)
{
final CreatureSay cs = new CreatureSay(0, 18, null, text);
for (PlayerInstance player : World.getInstance().getAllPlayers())
{
if ((player != null) && (player.isOnline() != 0))

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/CTF.java
View File

@@ -1596,8 +1596,7 @@ public class CTF implements EventTask
player.removeSkill(SkillTable.getInstance().getInfo(4289, 1));
}
final Ride dismount = new Ride(player.getObjectId(), Ride.ACTION_DISMOUNT, 0);
player.broadcastPacket(dismount);
player.broadcastPacket(new Ride(player.getObjectId(), Ride.ACTION_DISMOUNT, 0));
player.setMountObjectID(0);
}
player.broadcastUserInfo();
@@ -2915,8 +2914,7 @@ public class CTF implements EventTask
player.broadcastPacket(new SocialAction(player.getObjectId(), 16)); // Amazing glow
player._haveFlagCTF = true;
player.broadcastUserInfo();
final CreatureSay cs = new CreatureSay(player.getObjectId(), 15, ":", "You got it! Run back! ::"); // 8D
player.sendPacket(cs);
player.sendPacket(new CreatureSay(player.getObjectId(), 15, ":", "You got it! Run back! ::"));
}
/**

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/DM.java
View File

@@ -1443,8 +1443,7 @@ public class DM implements EventTask
player.removeSkill(SkillTable.getInstance().getInfo(4289, 1));
}
final Ride dismount = new Ride(player.getObjectId(), Ride.ACTION_DISMOUNT, 0);
player.broadcastPacket(dismount);
player.broadcastPacket(new Ride(player.getObjectId(), Ride.ACTION_DISMOUNT, 0));
player.setMountObjectID(0);
}
player.broadcastUserInfo();

1
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/GameEvent.java
View File

@@ -282,7 +282,6 @@ public class GameEvent
public static void announceAllPlayers(String text)
{
final CreatureSay cs = new CreatureSay(0, Say2.ANNOUNCEMENT, "", text);
for (PlayerInstance player : World.getInstance().getAllPlayers())
{
player.sendPacket(cs);

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/TvT.java
View File

@@ -1528,8 +1528,7 @@ public class TvT implements EventTask
player.removeSkill(SkillTable.getInstance().getInfo(4289, 1));
}
final Ride dismount = new Ride(player.getObjectId(), Ride.ACTION_DISMOUNT, 0);
player.broadcastPacket(dismount);
player.broadcastPacket(new Ride(player.getObjectId(), Ride.ACTION_DISMOUNT, 0));
player.setMountObjectID(0);
}
player.broadcastUserInfo();

10
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/olympiad/OlympiadGame.java
View File

@@ -292,8 +292,7 @@ class OlympiadGame
for (int itemId : activeSoulShots.values())
{
player.removeAutoSoulShot(itemId);
final ExAutoSoulShot atk = new ExAutoSoulShot(itemId, 0);
player.sendPacket(atk);
player.sendPacket(new ExAutoSoulShot(itemId, 0));
}
// Discharge any active shots
@@ -922,8 +921,7 @@ class OlympiadGame
return false;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.STARTS_THE_GAME);
broadcastMessage(sm, true);
broadcastMessage(new SystemMessage(SystemMessageId.STARTS_THE_GAME), true);
for (PlayerInstance player : _players)
{
@@ -1018,9 +1016,7 @@ class OlympiadGame
{
final int objId = manager.getLastSpawn().getObjectId();
final String npcName = manager.getLastSpawn().getName();
final CreatureSay cs = new CreatureSay(objId, 1, npcName, "Olympiad is going to begin in Arena " + (_stadiumID + 1) + " in a moment.");
manager.getLastSpawn().broadcastPacket(cs);
manager.getLastSpawn().broadcastPacket(new CreatureSay(objId, 1, npcName, "Olympiad is going to begin in Arena " + (_stadiumID + 1) + " in a moment."));
}
}
}

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/sevensigns/SevenSigns.java
View File

@@ -1258,7 +1258,6 @@ public class SevenSigns
public void sendMessageToAll(SystemMessageId sysMsgId)
{
final SystemMessage sm = new SystemMessage(sysMsgId);
for (PlayerInstance player : World.getInstance().getAllPlayers())
{
player.sendPacket(sm);
@@ -1620,7 +1619,6 @@ public class SevenSigns
teleLosingCabalFromDungeons(getCabalShortName(getCabalHighestScore()));
final SignsSky ss = new SignsSky();
for (PlayerInstance player : World.getInstance().getAllPlayers())
{
player.sendPacket(ss);

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/QuestState.java
View File

@@ -661,9 +661,9 @@ public class QuestState
}
// on quests, always refresh inventory
final InventoryUpdate u = new InventoryUpdate();
u.addItem(item);
_player.sendPacket(u);
final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(item);
_player.sendPacket(iu);
}
/**

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectClanGate.java
View File

@@ -43,8 +43,7 @@ public class EffectClanGate extends Effect
final Clan clan = ((PlayerInstance) getEffected()).getClan();
if (clan != null)
{
final SystemMessage msg = new SystemMessage(SystemMessageId.COURT_MAGICIAN_CREATED_PORTAL);
clan.broadcastToOtherOnlineMembers(msg, ((PlayerInstance) getEffected()));
clan.broadcastToOtherOnlineMembers(new SystemMessage(SystemMessageId.COURT_MAGICIAN_CREATED_PORTAL), ((PlayerInstance) getEffected()));
}
}
}

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectDamOverTime.java
View File

@@ -51,8 +51,7 @@ class EffectDamOverTime extends Effect
{
if (getSkill().isToggle())
{
final SystemMessage sm = new SystemMessage(SystemMessageId.SKILL_REMOVED_DUE_LACK_HP);
getEffected().sendPacket(sm);
getEffected().sendPacket(new SystemMessage(SystemMessageId.SKILL_REMOVED_DUE_LACK_HP));
getEffected().removeEffect(this);
exit(false);
return false;

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectDeflectBuff.java
View File

@@ -51,8 +51,7 @@ public class EffectDeflectBuff extends Effect
if (manaDam > getEffected().getCurrentMp())
{
final SystemMessage sm = new SystemMessage(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP);
getEffected().sendPacket(sm);
getEffected().sendPacket(new SystemMessage(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP));
return false;
}

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectFakeDeath.java
View File

@@ -61,8 +61,7 @@ final class EffectFakeDeath extends Effect
if ((manaDam > getEffected().getCurrentMp()) && getSkill().isToggle())
{
final SystemMessage sm = new SystemMessage(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP);
getEffected().sendPacket(sm);
getEffected().sendPacket(new SystemMessage(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP));
return false;
}

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectManaDamOverTime.java
View File

@@ -46,8 +46,7 @@ class EffectManaDamOverTime extends Effect
if ((manaDam > getEffected().getCurrentMp()) && getSkill().isToggle())
{
final SystemMessage sm = new SystemMessage(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP);
getEffected().sendPacket(sm);
getEffected().sendPacket(new SystemMessage(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP));
return false;
}

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectRelax.java
View File

@@ -84,8 +84,7 @@ class EffectRelax extends Effect
if ((manaDam > getEffected().getCurrentMp()) && getSkill().isToggle())
{
final SystemMessage sm = new SystemMessage(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP);
getEffected().sendPacket(sm);
getEffected().sendPacket(new SystemMessage(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP));
retval = false;
}

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectSilentMove.java
View File

@@ -79,8 +79,7 @@ final class EffectSilentMove extends Effect
if (manaDam > getEffected().getCurrentMp())
{
final SystemMessage sm = new SystemMessage(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP);
getEffected().sendPacket(sm);
getEffected().sendPacket(new SystemMessage(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP));
return false;
}

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectTargetMe.java
View File

@@ -53,8 +53,7 @@ public class EffectTargetMe extends Effect
{
// Target is different - stop autoattack and break cast
getEffected().setTarget(getEffector());
final MyTargetSelected my = new MyTargetSelected(getEffector().getObjectId(), 0);
getEffected().sendPacket(my);
getEffected().sendPacket(new MyTargetSelected(getEffector().getObjectId(), 0));
getEffected().getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
}
getEffected().getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, getEffector());

Some files were not shown because too many files have changed in this diff Show More