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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/FantasyIsle/HandysBlockCheckerEvent.java vendored
View File

@ -74,10 +74,7 @@ public class HandysBlockCheckerEvent extends AbstractNpcAI
if (HandysBlockCheckerManager.getInstance().addPlayerToArena(player, arena))
{
final ArenaParticipantsHolder holder = HandysBlockCheckerManager.getInstance().getHolder(arena);
final ExCubeGameTeamList tl = new ExCubeGameTeamList(holder.getRedPlayers(), holder.getBluePlayers(), arena);
player.sendPacket(tl);
player.sendPacket(new ExCubeGameTeamList(holder.getRedPlayers(), holder.getBluePlayers(), arena));
final int countBlue = holder.getBlueTeamSize();
final int countRed = holder.getRedTeamSize();

6
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java vendored
View File

@ -230,14 +230,12 @@ public class TrainingCamp extends AbstractNpcAI
{
if (player.getLevel() <= Config.TRAINING_CAMP_MIN_LEVEL)
{
final SystemMessage sysMsg = new SystemMessage(SystemMessageId.LV_S1_OR_ABOVE).addInt(Config.TRAINING_CAMP_MIN_LEVEL);
player.sendPacket(sysMsg);
player.sendPacket(new SystemMessage(SystemMessageId.LV_S1_OR_ABOVE).addInt(Config.TRAINING_CAMP_MIN_LEVEL));
return false;
}
else if (player.getLevel() >= Config.TRAINING_CAMP_MAX_LEVEL)
{
final SystemMessage sysMsg = new SystemMessage(SystemMessageId.LV_S1_OR_BELOW).addInt(Config.TRAINING_CAMP_MAX_LEVEL);
player.sendPacket(sysMsg);
player.sendPacket(new SystemMessage(SystemMessageId.LV_S1_OR_BELOW).addInt(Config.TRAINING_CAMP_MAX_LEVEL));
return false;
}
else if (player.isFlyingMounted() || player.isTransformed())

1
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java vendored
View File

@ -125,7 +125,6 @@ public class FreyaCelebration extends LongTimeEvent
{
final CreatureSay cs = new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.DEAR_S1_THINK_OF_THIS_AS_MY_APPRECIATION_FOR_THE_GIFT_TAKE_THIS_WITH_YOU_THERE_S_NOTHING_STRANGE_ABOUT_IT_IT_S_JUST_A_BIT_OF_MY_CAPRICIOUSNESS);
cs.addStringParameter(caster.getName());
npc.broadcastPacket(cs);
caster.addItem("FreyaCelebration", FREYA_GIFT, 1, npc, true);

3
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java vendored
View File

@ -194,8 +194,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)
{

3
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java vendored
View File

@ -113,8 +113,7 @@ public class AdminGmChat implements IAdminCommandHandler
offset = 13;
}
text = command.substring(offset);
final CreatureSay cs = new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text);
AdminData.getInstance().broadcastToGMs(cs);
AdminData.getInstance().broadcastToGMs(new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text));
}
catch (StringIndexOutOfBoundsException e)
{

5
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/usercommandhandlers/ChannelDelete.java vendored
View File

@ -44,10 +44,7 @@ public class ChannelDelete implements IUserCommandHandler
if (player.isInParty() && player.getParty().isLeader(player) && player.getParty().isInCommandChannel() && player.getParty().getCommandChannel().getLeader().equals(player))
{
final CommandChannel channel = player.getParty().getCommandChannel();
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_COMMAND_CHANNEL_HAS_BEEN_DISBANDED);
channel.broadcastPacket(sm);
channel.broadcastPacket(new SystemMessage(SystemMessageId.THE_COMMAND_CHANNEL_HAS_BEEN_DISBANDED));
channel.disbandChannel();
return true;
}

1
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/usercommandhandlers/ChannelLeave.java vendored
View File

@ -61,7 +61,6 @@ public class ChannelLeave implements IUserCommandHandler
return true;
}
return false;
}
@Override

3
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ai/AbstractAI.java
View File

@ -667,8 +667,7 @@ public 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
_intention = AI_INTENTION_IDLE;

4
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/CursedWeapon.java
View File

@ -260,9 +260,9 @@ public class CursedWeapon implements INamable
_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);
Broadcast.toAllOnlinePlayers(packet);
Broadcast.toAllOnlinePlayers(rs);
Broadcast.toAllOnlinePlayers(eq);
}
else

24
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -1807,8 +1807,7 @@ public class PlayerInstance extends Playable
return;
}
_lastCompassZone = ExSetCompassZoneCode.ALTEREDZONE;
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.ALTEREDZONE);
sendPacket(cz);
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.ALTEREDZONE));
}
else if (isInsideZone(ZoneId.SIEGE))
{
@ -1817,8 +1816,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))
{
@ -1827,8 +1825,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 (isInsideZone(ZoneId.PEACE))
{
@ -1837,8 +1834,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
{
@ -1851,8 +1847,7 @@ public class PlayerInstance extends Playable
updatePvPStatus();
}
_lastCompassZone = ExSetCompassZoneCode.GENERALZONE;
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.GENERALZONE);
sendPacket(cz);
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.GENERALZONE));
}
}
@ -4402,8 +4397,7 @@ public class PlayerInstance extends Playable
sendPacket(ActionFailed.STATIC_PACKET);
// Send a Server->Client packet StopMove to this PlayerInstance
final StopMove sm = new StopMove(this);
sendPacket(sm);
sendPacket(new StopMove(this));
SystemMessage smsg = null;
synchronized (target)
@ -11781,8 +11775,7 @@ public class PlayerInstance extends Playable
else if (_canFeed)
{
setCurrentFeed(getMaxFeed());
final SetupGauge sg = new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume());
sendPacket(sg);
sendPacket(new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()));
if (!isDead())
{
_mountFeedTask = ThreadPool.scheduleAtFixedRate(new PetFeedTask(this), 10000, 10000);
@ -11841,8 +11834,7 @@ public class PlayerInstance extends Playable
{
final boolean lastHungryState = isHungry();
_curFeed = num > getMaxFeed() ? getMaxFeed() : num;
final SetupGauge sg = new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume());
sendPacket(sg);
sendPacket(new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()));
// broadcast move speed change when strider becomes hungry / full
if (lastHungryState != isHungry())
{

6
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/RaceManagerInstance.java
View File

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

3
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
View File

@ -78,8 +78,7 @@ public class CommandChannelMatchingRoom extends MatchingRoom
p.sendPacket(new ExMPCCRoomMember(player, this));
});
final SystemMessage sm = new SystemMessage(kicked ? SystemMessageId.YOU_WERE_EXPELLED_FROM_THE_COMMAND_CHANNEL_MATCHING_ROOM : SystemMessageId.YOU_EXITED_FROM_THE_COMMAND_CHANNEL_MATCHING_ROOM);
player.sendPacket(sm);
player.sendPacket(new SystemMessage(kicked ? SystemMessageId.YOU_WERE_EXPELLED_FROM_THE_COMMAND_CHANNEL_MATCHING_ROOM : SystemMessageId.YOU_EXITED_FROM_THE_COMMAND_CHANNEL_MATCHING_ROOM));
}
@Override

3
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
View File

@ -84,8 +84,7 @@ public class PartyMatchingRoom extends MatchingRoom
p.sendPacket(SystemMessageId.THE_LEADER_OF_THE_PARTY_ROOM_HAS_CHANGED);
});
final SystemMessage sm2 = new SystemMessage(kicked ? SystemMessageId.YOU_HAVE_BEEN_OUSTED_FROM_THE_PARTY_ROOM : SystemMessageId.YOU_HAVE_EXITED_THE_PARTY_ROOM);
player.sendPacket(sm2);
player.sendPacket(new SystemMessage(kicked ? SystemMessageId.YOU_HAVE_BEEN_OUSTED_FROM_THE_PARTY_ROOM : SystemMessageId.YOU_HAVE_EXITED_THE_PARTY_ROOM));
player.sendPacket(ExClosePartyRoom.STATIC_PACKET);
}

3
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java
View File

@ -194,8 +194,7 @@ public abstract class VoteSystem implements Runnable
private void announce(String msg)
{
final CreatureSay cs = new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg);
Broadcast.toAllOnlinePlayers(cs);
Broadcast.toAllOnlinePlayers(new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg));
}
public abstract int getVotes();

3
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymoreInVehicle.java
View File

@ -56,8 +56,7 @@ public class CannotMoveAnymoreInVehicle implements IClientIncomingPacket
{
player.setInVehiclePosition(new Location(_x, _y, _z));
player.setHeading(_heading);
final StopMoveInVehicle msg = new StopMoveInVehicle(player, _boatId);
player.broadcastPacket(msg);
player.broadcastPacket(new StopMoveInVehicle(player, _boatId));
}
}
}

3
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java
View File

@ -107,8 +107,7 @@ public class RequestAnswerFriendInvite implements IClientIncomingPacket
}
else
{
final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_ADD_A_FRIEND_TO_YOUR_FRIENDS_LIST);
requestor.sendPacket(msg);
requestor.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_ADD_A_FRIEND_TO_YOUR_FRIENDS_LIST));
}
player.setActiveRequester(null);

5
L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/FantasyIsle/HandysBlockCheckerEvent.java vendored
View File

@ -74,10 +74,7 @@ public class HandysBlockCheckerEvent extends AbstractNpcAI
if (HandysBlockCheckerManager.getInstance().addPlayerToArena(player, arena))
{
final ArenaParticipantsHolder holder = HandysBlockCheckerManager.getInstance().getHolder(arena);
final ExCubeGameTeamList tl = new ExCubeGameTeamList(holder.getRedPlayers(), holder.getBluePlayers(), arena);
player.sendPacket(tl);
player.sendPacket(new ExCubeGameTeamList(holder.getRedPlayers(), holder.getBluePlayers(), arena));
final int countBlue = holder.getBlueTeamSize();
final int countRed = holder.getRedTeamSize();

6
L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java vendored
View File

@ -230,14 +230,12 @@ public class TrainingCamp extends AbstractNpcAI
{
if (player.getLevel() <= Config.TRAINING_CAMP_MIN_LEVEL)
{
final SystemMessage sysMsg = new SystemMessage(SystemMessageId.LV_S1_OR_ABOVE).addInt(Config.TRAINING_CAMP_MIN_LEVEL);
player.sendPacket(sysMsg);
player.sendPacket(new SystemMessage(SystemMessageId.LV_S1_OR_ABOVE).addInt(Config.TRAINING_CAMP_MIN_LEVEL));
return false;
}
else if (player.getLevel() >= Config.TRAINING_CAMP_MAX_LEVEL)
{
final SystemMessage sysMsg = new SystemMessage(SystemMessageId.LV_S1_OR_BELOW).addInt(Config.TRAINING_CAMP_MAX_LEVEL);
player.sendPacket(sysMsg);
player.sendPacket(new SystemMessage(SystemMessageId.LV_S1_OR_BELOW).addInt(Config.TRAINING_CAMP_MAX_LEVEL));
return false;
}
else if (player.isFlyingMounted() || player.isTransformed())

1
L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java vendored
View File

@ -125,7 +125,6 @@ public class FreyaCelebration extends LongTimeEvent
{
final CreatureSay cs = new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.DEAR_S1_THINK_OF_THIS_AS_MY_APPRECIATION_FOR_THE_GIFT_TAKE_THIS_WITH_YOU_THERE_S_NOTHING_STRANGE_ABOUT_IT_IT_S_JUST_A_BIT_OF_MY_CAPRICIOUSNESS);
cs.addStringParameter(caster.getName());
npc.broadcastPacket(cs);
caster.addItem("FreyaCelebration", FREYA_GIFT, 1, npc, true);

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java vendored
View File

@ -194,8 +194,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)
{

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java vendored
View File

@ -113,8 +113,7 @@ public class AdminGmChat implements IAdminCommandHandler
offset = 13;
}
text = command.substring(offset);
final CreatureSay cs = new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text);
AdminData.getInstance().broadcastToGMs(cs);
AdminData.getInstance().broadcastToGMs(new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text));
}
catch (StringIndexOutOfBoundsException e)
{

5
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/usercommandhandlers/ChannelDelete.java vendored
View File

@ -44,10 +44,7 @@ public class ChannelDelete implements IUserCommandHandler
if (player.isInParty() && player.getParty().isLeader(player) && player.getParty().isInCommandChannel() && player.getParty().getCommandChannel().getLeader().equals(player))
{
final CommandChannel channel = player.getParty().getCommandChannel();
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_COMMAND_CHANNEL_HAS_BEEN_DISBANDED);
channel.broadcastPacket(sm);
channel.broadcastPacket(new SystemMessage(SystemMessageId.THE_COMMAND_CHANNEL_HAS_BEEN_DISBANDED));
channel.disbandChannel();
return true;
}

1
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/usercommandhandlers/ChannelLeave.java vendored
View File

@ -61,7 +61,6 @@ public class ChannelLeave implements IUserCommandHandler
return true;
}
return false;
}
@Override

3
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ai/AbstractAI.java
View File

@ -667,8 +667,7 @@ public 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
_intention = AI_INTENTION_IDLE;

4
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/CursedWeapon.java
View File

@ -260,9 +260,9 @@ public class CursedWeapon implements INamable
_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);
Broadcast.toAllOnlinePlayers(packet);
Broadcast.toAllOnlinePlayers(rs);
Broadcast.toAllOnlinePlayers(eq);
}
else

24
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -1813,8 +1813,7 @@ public class PlayerInstance extends Playable
return;
}
_lastCompassZone = ExSetCompassZoneCode.ALTEREDZONE;
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.ALTEREDZONE);
sendPacket(cz);
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.ALTEREDZONE));
}
else if (isInsideZone(ZoneId.SIEGE))
{
@ -1823,8 +1822,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))
{
@ -1833,8 +1831,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 (isInsideZone(ZoneId.PEACE))
{
@ -1843,8 +1840,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
{
@ -1857,8 +1853,7 @@ public class PlayerInstance extends Playable
updatePvPStatus();
}
_lastCompassZone = ExSetCompassZoneCode.GENERALZONE;
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.GENERALZONE);
sendPacket(cz);
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.GENERALZONE));
}
}
@ -4408,8 +4403,7 @@ public class PlayerInstance extends Playable
sendPacket(ActionFailed.STATIC_PACKET);
// Send a Server->Client packet StopMove to this PlayerInstance
final StopMove sm = new StopMove(this);
sendPacket(sm);
sendPacket(new StopMove(this));
SystemMessage smsg = null;
synchronized (target)
@ -11788,8 +11782,7 @@ public class PlayerInstance extends Playable
else if (_canFeed)
{
setCurrentFeed(getMaxFeed());
final SetupGauge sg = new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume());
sendPacket(sg);
sendPacket(new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()));
if (!isDead())
{
_mountFeedTask = ThreadPool.scheduleAtFixedRate(new PetFeedTask(this), 10000, 10000);
@ -11848,8 +11841,7 @@ public class PlayerInstance extends Playable
{
final boolean lastHungryState = isHungry();
_curFeed = num > getMaxFeed() ? getMaxFeed() : num;
final SetupGauge sg = new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume());
sendPacket(sg);
sendPacket(new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()));
// broadcast move speed change when strider becomes hungry / full
if (lastHungryState != isHungry())
{

6
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/RaceManagerInstance.java
View File

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

3
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
View File

@ -78,8 +78,7 @@ public class CommandChannelMatchingRoom extends MatchingRoom
p.sendPacket(new ExMPCCRoomMember(player, this));
});
final SystemMessage sm = new SystemMessage(kicked ? SystemMessageId.YOU_WERE_EXPELLED_FROM_THE_COMMAND_CHANNEL_MATCHING_ROOM : SystemMessageId.YOU_EXITED_FROM_THE_COMMAND_CHANNEL_MATCHING_ROOM);
player.sendPacket(sm);
player.sendPacket(new SystemMessage(kicked ? SystemMessageId.YOU_WERE_EXPELLED_FROM_THE_COMMAND_CHANNEL_MATCHING_ROOM : SystemMessageId.YOU_EXITED_FROM_THE_COMMAND_CHANNEL_MATCHING_ROOM));
}
@Override

3
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
View File

@ -84,8 +84,7 @@ public class PartyMatchingRoom extends MatchingRoom
p.sendPacket(SystemMessageId.THE_LEADER_OF_THE_PARTY_ROOM_HAS_CHANGED);
});
final SystemMessage sm2 = new SystemMessage(kicked ? SystemMessageId.YOU_HAVE_BEEN_OUSTED_FROM_THE_PARTY_ROOM : SystemMessageId.YOU_HAVE_EXITED_THE_PARTY_ROOM);
player.sendPacket(sm2);
player.sendPacket(new SystemMessage(kicked ? SystemMessageId.YOU_HAVE_BEEN_OUSTED_FROM_THE_PARTY_ROOM : SystemMessageId.YOU_HAVE_EXITED_THE_PARTY_ROOM));
player.sendPacket(ExClosePartyRoom.STATIC_PACKET);
}

3
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java
View File

@ -194,8 +194,7 @@ public abstract class VoteSystem implements Runnable
private void announce(String msg)
{
final CreatureSay cs = new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg);
Broadcast.toAllOnlinePlayers(cs);
Broadcast.toAllOnlinePlayers(new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg));
}
public abstract int getVotes();

3
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymoreInVehicle.java
View File

@ -56,8 +56,7 @@ public class CannotMoveAnymoreInVehicle implements IClientIncomingPacket
{
player.setInVehiclePosition(new Location(_x, _y, _z));
player.setHeading(_heading);
final StopMoveInVehicle msg = new StopMoveInVehicle(player, _boatId);
player.broadcastPacket(msg);
player.broadcastPacket(new StopMoveInVehicle(player, _boatId));
}
}
}

3
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java
View File

@ -107,8 +107,7 @@ public class RequestAnswerFriendInvite implements IClientIncomingPacket
}
else
{
final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_ADD_A_FRIEND_TO_YOUR_FRIENDS_LIST);
requestor.sendPacket(msg);
requestor.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_ADD_A_FRIEND_TO_YOUR_FRIENDS_LIST));
}
player.setActiveRequester(null);

5
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/FantasyIsle/HandysBlockCheckerEvent.java vendored
View File

@ -74,10 +74,7 @@ public class HandysBlockCheckerEvent extends AbstractNpcAI
if (HandysBlockCheckerManager.getInstance().addPlayerToArena(player, arena))
{
final ArenaParticipantsHolder holder = HandysBlockCheckerManager.getInstance().getHolder(arena);
final ExCubeGameTeamList tl = new ExCubeGameTeamList(holder.getRedPlayers(), holder.getBluePlayers(), arena);
player.sendPacket(tl);
player.sendPacket(new ExCubeGameTeamList(holder.getRedPlayers(), holder.getBluePlayers(), arena));
final int countBlue = holder.getBlueTeamSize();
final int countRed = holder.getRedTeamSize();

6
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java vendored
View File

@ -230,14 +230,12 @@ public class TrainingCamp extends AbstractNpcAI
{
if (player.getLevel() <= Config.TRAINING_CAMP_MIN_LEVEL)
{
final SystemMessage sysMsg = new SystemMessage(SystemMessageId.LV_S1_OR_ABOVE).addInt(Config.TRAINING_CAMP_MIN_LEVEL);
player.sendPacket(sysMsg);
player.sendPacket(new SystemMessage(SystemMessageId.LV_S1_OR_ABOVE).addInt(Config.TRAINING_CAMP_MIN_LEVEL));
return false;
}
else if (player.getLevel() >= Config.TRAINING_CAMP_MAX_LEVEL)
{
final SystemMessage sysMsg = new SystemMessage(SystemMessageId.LV_S1_OR_BELOW).addInt(Config.TRAINING_CAMP_MAX_LEVEL);
player.sendPacket(sysMsg);
player.sendPacket(new SystemMessage(SystemMessageId.LV_S1_OR_BELOW).addInt(Config.TRAINING_CAMP_MAX_LEVEL));
return false;
}
else if (player.isFlyingMounted() || player.isTransformed())

1
L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java vendored
View File

@ -125,7 +125,6 @@ public class FreyaCelebration extends LongTimeEvent
{
final CreatureSay cs = new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.DEAR_S1_THINK_OF_THIS_AS_MY_APPRECIATION_FOR_THE_GIFT_TAKE_THIS_WITH_YOU_THERE_S_NOTHING_STRANGE_ABOUT_IT_IT_S_JUST_A_BIT_OF_MY_CAPRICIOUSNESS);
cs.addStringParameter(caster.getName());
npc.broadcastPacket(cs);
caster.addItem("FreyaCelebration", FREYA_GIFT, 1, npc, true);

3
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java vendored
View File

@ -194,8 +194,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)
{

3
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java vendored
View File

@ -113,8 +113,7 @@ public class AdminGmChat implements IAdminCommandHandler
offset = 13;
}
text = command.substring(offset);
final CreatureSay cs = new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text);
AdminData.getInstance().broadcastToGMs(cs);
AdminData.getInstance().broadcastToGMs(new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text));
}
catch (StringIndexOutOfBoundsException e)
{

5
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/usercommandhandlers/ChannelDelete.java vendored
View File

@ -44,10 +44,7 @@ public class ChannelDelete implements IUserCommandHandler
if (player.isInParty() && player.getParty().isLeader(player) && player.getParty().isInCommandChannel() && player.getParty().getCommandChannel().getLeader().equals(player))
{
final CommandChannel channel = player.getParty().getCommandChannel();
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_COMMAND_CHANNEL_HAS_BEEN_DISBANDED);
channel.broadcastPacket(sm);
channel.broadcastPacket(new SystemMessage(SystemMessageId.THE_COMMAND_CHANNEL_HAS_BEEN_DISBANDED));
channel.disbandChannel();
return true;
}

1
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/usercommandhandlers/ChannelLeave.java vendored
View File

@ -61,7 +61,6 @@ public class ChannelLeave implements IUserCommandHandler
return true;
}
return false;
}
@Override

3
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ai/AbstractAI.java
View File

@ -667,8 +667,7 @@ public 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
_intention = AI_INTENTION_IDLE;

4
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/CursedWeapon.java
View File

@ -260,9 +260,9 @@ public class CursedWeapon implements INamable
_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);
Broadcast.toAllOnlinePlayers(packet);
Broadcast.toAllOnlinePlayers(rs);
Broadcast.toAllOnlinePlayers(eq);
}
else

24
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -1815,8 +1815,7 @@ public class PlayerInstance extends Playable
return;
}
_lastCompassZone = ExSetCompassZoneCode.ALTEREDZONE;
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.ALTEREDZONE);
sendPacket(cz);
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.ALTEREDZONE));
}
else if (isInsideZone(ZoneId.SIEGE))
{
@ -1825,8 +1824,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))
{
@ -1835,8 +1833,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 (isInsideZone(ZoneId.PEACE))
{
@ -1845,8 +1842,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
{
@ -1859,8 +1855,7 @@ public class PlayerInstance extends Playable
updatePvPStatus();
}
_lastCompassZone = ExSetCompassZoneCode.GENERALZONE;
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.GENERALZONE);
sendPacket(cz);
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.GENERALZONE));
}
}
@ -4410,8 +4405,7 @@ public class PlayerInstance extends Playable
sendPacket(ActionFailed.STATIC_PACKET);
// Send a Server->Client packet StopMove to this PlayerInstance
final StopMove sm = new StopMove(this);
sendPacket(sm);
sendPacket(new StopMove(this));
SystemMessage smsg = null;
synchronized (target)
@ -11790,8 +11784,7 @@ public class PlayerInstance extends Playable
else if (_canFeed)
{
setCurrentFeed(getMaxFeed());
final SetupGauge sg = new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume());
sendPacket(sg);
sendPacket(new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()));
if (!isDead())
{
_mountFeedTask = ThreadPool.scheduleAtFixedRate(new PetFeedTask(this), 10000, 10000);
@ -11850,8 +11843,7 @@ public class PlayerInstance extends Playable
{
final boolean lastHungryState = isHungry();
_curFeed = num > getMaxFeed() ? getMaxFeed() : num;
final SetupGauge sg = new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume());
sendPacket(sg);
sendPacket(new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()));
// broadcast move speed change when strider becomes hungry / full
if (lastHungryState != isHungry())
{

6
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/RaceManagerInstance.java
View File

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

3
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
View File

@ -78,8 +78,7 @@ public class CommandChannelMatchingRoom extends MatchingRoom
p.sendPacket(new ExMPCCRoomMember(player, this));
});
final SystemMessage sm = new SystemMessage(kicked ? SystemMessageId.YOU_WERE_EXPELLED_FROM_THE_COMMAND_CHANNEL_MATCHING_ROOM : SystemMessageId.YOU_EXITED_FROM_THE_COMMAND_CHANNEL_MATCHING_ROOM);
player.sendPacket(sm);
player.sendPacket(new SystemMessage(kicked ? SystemMessageId.YOU_WERE_EXPELLED_FROM_THE_COMMAND_CHANNEL_MATCHING_ROOM : SystemMessageId.YOU_EXITED_FROM_THE_COMMAND_CHANNEL_MATCHING_ROOM));
}
@Override

3
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
View File

@ -84,8 +84,7 @@ public class PartyMatchingRoom extends MatchingRoom
p.sendPacket(SystemMessageId.THE_LEADER_OF_THE_PARTY_ROOM_HAS_CHANGED);
});
final SystemMessage sm2 = new SystemMessage(kicked ? SystemMessageId.YOU_HAVE_BEEN_OUSTED_FROM_THE_PARTY_ROOM : SystemMessageId.YOU_HAVE_EXITED_THE_PARTY_ROOM);
player.sendPacket(sm2);
player.sendPacket(new SystemMessage(kicked ? SystemMessageId.YOU_HAVE_BEEN_OUSTED_FROM_THE_PARTY_ROOM : SystemMessageId.YOU_HAVE_EXITED_THE_PARTY_ROOM));
player.sendPacket(ExClosePartyRoom.STATIC_PACKET);
}

3
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java
View File

@ -194,8 +194,7 @@ public abstract class VoteSystem implements Runnable
private void announce(String msg)
{
final CreatureSay cs = new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg);
Broadcast.toAllOnlinePlayers(cs);
Broadcast.toAllOnlinePlayers(new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg));
}
public abstract int getVotes();

3
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymoreInVehicle.java
View File

@ -56,8 +56,7 @@ public class CannotMoveAnymoreInVehicle implements IClientIncomingPacket
{
player.setInVehiclePosition(new Location(_x, _y, _z));
player.setHeading(_heading);
final StopMoveInVehicle msg = new StopMoveInVehicle(player, _boatId);
player.broadcastPacket(msg);
player.broadcastPacket(new StopMoveInVehicle(player, _boatId));
}
}
}

3
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java
View File

@ -107,8 +107,7 @@ public class RequestAnswerFriendInvite implements IClientIncomingPacket
}
else
{
final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_ADD_A_FRIEND_TO_YOUR_FRIENDS_LIST);
requestor.sendPacket(msg);
requestor.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_ADD_A_FRIEND_TO_YOUR_FRIENDS_LIST));
}
player.setActiveRequester(null);

5
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/FantasyIsle/HandysBlockCheckerEvent.java vendored
View File

@ -74,10 +74,7 @@ public class HandysBlockCheckerEvent extends AbstractNpcAI
if (HandysBlockCheckerManager.getInstance().addPlayerToArena(player, arena))
{
final ArenaParticipantsHolder holder = HandysBlockCheckerManager.getInstance().getHolder(arena);
final ExCubeGameTeamList tl = new ExCubeGameTeamList(holder.getRedPlayers(), holder.getBluePlayers(), arena);
player.sendPacket(tl);
player.sendPacket(new ExCubeGameTeamList(holder.getRedPlayers(), holder.getBluePlayers(), arena));
final int countBlue = holder.getBlueTeamSize();
final int countRed = holder.getRedTeamSize();

6
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java vendored
View File

@ -230,14 +230,12 @@ public class TrainingCamp extends AbstractNpcAI
{
if (player.getLevel() <= Config.TRAINING_CAMP_MIN_LEVEL)
{
final SystemMessage sysMsg = new SystemMessage(SystemMessageId.LV_S1_OR_ABOVE).addInt(Config.TRAINING_CAMP_MIN_LEVEL);
player.sendPacket(sysMsg);
player.sendPacket(new SystemMessage(SystemMessageId.LV_S1_OR_ABOVE).addInt(Config.TRAINING_CAMP_MIN_LEVEL));
return false;
}
else if (player.getLevel() >= Config.TRAINING_CAMP_MAX_LEVEL)
{
final SystemMessage sysMsg = new SystemMessage(SystemMessageId.LV_S1_OR_BELOW).addInt(Config.TRAINING_CAMP_MAX_LEVEL);
player.sendPacket(sysMsg);
player.sendPacket(new SystemMessage(SystemMessageId.LV_S1_OR_BELOW).addInt(Config.TRAINING_CAMP_MAX_LEVEL));
return false;
}
else if (player.isFlyingMounted() || player.isTransformed())

1
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java vendored
View File

@ -125,7 +125,6 @@ public class FreyaCelebration extends LongTimeEvent
{
final CreatureSay cs = new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.DEAR_S1_THINK_OF_THIS_AS_MY_APPRECIATION_FOR_THE_GIFT_TAKE_THIS_WITH_YOU_THERE_S_NOTHING_STRANGE_ABOUT_IT_IT_S_JUST_A_BIT_OF_MY_CAPRICIOUSNESS);
cs.addStringParameter(caster.getName());
npc.broadcastPacket(cs);
caster.addItem("FreyaCelebration", FREYA_GIFT, 1, npc, true);

3
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java vendored
View File

@ -194,8 +194,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)
{

3
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java vendored
View File

@ -113,8 +113,7 @@ public class AdminGmChat implements IAdminCommandHandler
offset = 13;
}
text = command.substring(offset);
final CreatureSay cs = new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text);
AdminData.getInstance().broadcastToGMs(cs);
AdminData.getInstance().broadcastToGMs(new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text));
}
catch (StringIndexOutOfBoundsException e)
{

5
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/usercommandhandlers/ChannelDelete.java vendored
View File

@ -44,10 +44,7 @@ public class ChannelDelete implements IUserCommandHandler
if (player.isInParty() && player.getParty().isLeader(player) && player.getParty().isInCommandChannel() && player.getParty().getCommandChannel().getLeader().equals(player))
{
final CommandChannel channel = player.getParty().getCommandChannel();
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_COMMAND_CHANNEL_HAS_BEEN_DISBANDED);
channel.broadcastPacket(sm);
channel.broadcastPacket(new SystemMessage(SystemMessageId.THE_COMMAND_CHANNEL_HAS_BEEN_DISBANDED));
channel.disbandChannel();
return true;
}

1
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/usercommandhandlers/ChannelLeave.java vendored
View File

@ -61,7 +61,6 @@ public class ChannelLeave implements IUserCommandHandler
return true;
}
return false;
}
@Override

3
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/AbstractAI.java
View File

@ -667,8 +667,7 @@ public 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
_intention = AI_INTENTION_IDLE;

4
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/CursedWeapon.java
View File

@ -260,9 +260,9 @@ public class CursedWeapon implements INamable
_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);
Broadcast.toAllOnlinePlayers(packet);
Broadcast.toAllOnlinePlayers(rs);
Broadcast.toAllOnlinePlayers(eq);
}
else

25
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -1824,8 +1824,7 @@ public class PlayerInstance extends Playable
return;
}
_lastCompassZone = ExSetCompassZoneCode.ALTEREDZONE;
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.ALTEREDZONE);
sendPacket(cz);
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.ALTEREDZONE));
}
else if (isInsideZone(ZoneId.SIEGE))
{
@ -1834,8 +1833,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))
{
@ -1844,8 +1842,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 (isInsideZone(ZoneId.PEACE))
{
@ -1854,8 +1851,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
{
@ -1868,8 +1864,7 @@ public class PlayerInstance extends Playable
updatePvPStatus();
}
_lastCompassZone = ExSetCompassZoneCode.GENERALZONE;
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.GENERALZONE);
sendPacket(cz);
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.GENERALZONE));
}
}
@ -4399,8 +4394,7 @@ public class PlayerInstance extends Playable
sendPacket(ActionFailed.STATIC_PACKET);
// Send a Server->Client packet StopMove to this PlayerInstance
final StopMove sm = new StopMove(this);
sendPacket(sm);
sendPacket(new StopMove(this));
SystemMessage smsg = null;
synchronized (target)
@ -10457,7 +10451,6 @@ public class PlayerInstance extends Playable
if (!_snoopListener.isEmpty())
{
final Snoop sn = new Snoop(getObjectId(), getName(), type, name, text);
for (PlayerInstance pci : _snoopListener)
{
if (pci != null)
@ -11758,8 +11751,7 @@ public class PlayerInstance extends Playable
else if (_canFeed)
{
setCurrentFeed(getMaxFeed());
final SetupGauge sg = new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume());
sendPacket(sg);
sendPacket(new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()));
if (!isDead())
{
_mountFeedTask = ThreadPool.scheduleAtFixedRate(new PetFeedTask(this), 10000, 10000);
@ -11818,8 +11810,7 @@ public class PlayerInstance extends Playable
{
final boolean lastHungryState = isHungry();
_curFeed = num > getMaxFeed() ? getMaxFeed() : num;
final SetupGauge sg = new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume());
sendPacket(sg);
sendPacket(new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()));
// broadcast move speed change when strider becomes hungry / full
if (lastHungryState != isHungry())
{

6
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/RaceManagerInstance.java
View File

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

3
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
View File

@ -78,8 +78,7 @@ public class CommandChannelMatchingRoom extends MatchingRoom
p.sendPacket(new ExMPCCRoomMember(player, this));
});
final SystemMessage sm = new SystemMessage(kicked ? SystemMessageId.YOU_WERE_EXPELLED_FROM_THE_COMMAND_CHANNEL_MATCHING_ROOM : SystemMessageId.YOU_EXITED_FROM_THE_COMMAND_CHANNEL_MATCHING_ROOM);
player.sendPacket(sm);
player.sendPacket(new SystemMessage(kicked ? SystemMessageId.YOU_WERE_EXPELLED_FROM_THE_COMMAND_CHANNEL_MATCHING_ROOM : SystemMessageId.YOU_EXITED_FROM_THE_COMMAND_CHANNEL_MATCHING_ROOM));
}
@Override

3
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
View File

@ -84,8 +84,7 @@ public class PartyMatchingRoom extends MatchingRoom
p.sendPacket(SystemMessageId.THE_LEADER_OF_THE_PARTY_ROOM_HAS_CHANGED);
});
final SystemMessage sm2 = new SystemMessage(kicked ? SystemMessageId.YOU_HAVE_BEEN_OUSTED_FROM_THE_PARTY_ROOM : SystemMessageId.YOU_HAVE_EXITED_THE_PARTY_ROOM);
player.sendPacket(sm2);
player.sendPacket(new SystemMessage(kicked ? SystemMessageId.YOU_HAVE_BEEN_OUSTED_FROM_THE_PARTY_ROOM : SystemMessageId.YOU_HAVE_EXITED_THE_PARTY_ROOM));
player.sendPacket(ExClosePartyRoom.STATIC_PACKET);
}

3
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java
View File

@ -194,8 +194,7 @@ public abstract class VoteSystem implements Runnable
private void announce(String msg)
{
final CreatureSay cs = new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg);
Broadcast.toAllOnlinePlayers(cs);
Broadcast.toAllOnlinePlayers(new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg));
}
public abstract int getVotes();

3
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymoreInVehicle.java
View File

@ -56,8 +56,7 @@ public class CannotMoveAnymoreInVehicle implements IClientIncomingPacket
{
player.setInVehiclePosition(new Location(_x, _y, _z));
player.setHeading(_heading);
final StopMoveInVehicle msg = new StopMoveInVehicle(player, _boatId);
player.broadcastPacket(msg);
player.broadcastPacket(new StopMoveInVehicle(player, _boatId));
}
}
}

3
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookDestroy.java
View File

@ -67,7 +67,6 @@ public class RequestRecipeBookDestroy implements IClientIncomingPacket
player.unregisterRecipeList(_recipeID);
// Send the new recipe book.
final RecipeBookItemList response = new RecipeBookItemList(player, rp.isDwarvenRecipe());
player.sendPacket(response);
player.sendPacket(new RecipeBookItemList(player, rp.isDwarvenRecipe()));
}
}

3
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
View File

@ -61,7 +61,6 @@ public class RequestRecipeBookOpen implements IClientIncomingPacket
return;
}
final RecipeBookItemList response = new RecipeBookItemList(player, _isDwarvenCraft);
player.sendPacket(response);
player.sendPacket(new RecipeBookItemList(player, _isDwarvenCraft));
}
}

3
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java
View File

@ -107,8 +107,7 @@ public class RequestAnswerFriendInvite implements IClientIncomingPacket
}
else
{
final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_ADD_A_FRIEND_TO_YOUR_FRIENDS_LIST);
requestor.sendPacket(msg);
requestor.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_ADD_A_FRIEND_TO_YOUR_FRIENDS_LIST));
}
player.setActiveRequester(null);

5
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/FantasyIsle/HandysBlockCheckerEvent.java vendored
View File

@ -74,10 +74,7 @@ public class HandysBlockCheckerEvent extends AbstractNpcAI
if (HandysBlockCheckerManager.getInstance().addPlayerToArena(player, arena))
{
final ArenaParticipantsHolder holder = HandysBlockCheckerManager.getInstance().getHolder(arena);
final ExCubeGameTeamList tl = new ExCubeGameTeamList(holder.getRedPlayers(), holder.getBluePlayers(), arena);
player.sendPacket(tl);
player.sendPacket(new ExCubeGameTeamList(holder.getRedPlayers(), holder.getBluePlayers(), arena));
final int countBlue = holder.getBlueTeamSize();
final int countRed = holder.getRedTeamSize();

6
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java vendored
View File

@ -230,14 +230,12 @@ public class TrainingCamp extends AbstractNpcAI
{
if (player.getLevel() <= Config.TRAINING_CAMP_MIN_LEVEL)
{
final SystemMessage sysMsg = new SystemMessage(SystemMessageId.LV_S1_OR_ABOVE).addInt(Config.TRAINING_CAMP_MIN_LEVEL);
player.sendPacket(sysMsg);
player.sendPacket(new SystemMessage(SystemMessageId.LV_S1_OR_ABOVE).addInt(Config.TRAINING_CAMP_MIN_LEVEL));
return false;
}
else if (player.getLevel() >= Config.TRAINING_CAMP_MAX_LEVEL)
{
final SystemMessage sysMsg = new SystemMessage(SystemMessageId.LV_S1_OR_BELOW).addInt(Config.TRAINING_CAMP_MAX_LEVEL);
player.sendPacket(sysMsg);
player.sendPacket(new SystemMessage(SystemMessageId.LV_S1_OR_BELOW).addInt(Config.TRAINING_CAMP_MAX_LEVEL));
return false;
}
else if (player.isFlyingMounted() || player.isTransformed())

1
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java vendored
View File

@ -125,7 +125,6 @@ public class FreyaCelebration extends LongTimeEvent
{
final CreatureSay cs = new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.DEAR_S1_THINK_OF_THIS_AS_MY_APPRECIATION_FOR_THE_GIFT_TAKE_THIS_WITH_YOU_THERE_S_NOTHING_STRANGE_ABOUT_IT_IT_S_JUST_A_BIT_OF_MY_CAPRICIOUSNESS);
cs.addStringParameter(caster.getName());
npc.broadcastPacket(cs);
caster.addItem("FreyaCelebration", FREYA_GIFT, 1, npc, true);

3
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java vendored
View File

@ -194,8 +194,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)
{

3
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java vendored
View File

@ -113,8 +113,7 @@ public class AdminGmChat implements IAdminCommandHandler
offset = 13;
}
text = command.substring(offset);
final CreatureSay cs = new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text);
AdminData.getInstance().broadcastToGMs(cs);
AdminData.getInstance().broadcastToGMs(new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text));
}
catch (StringIndexOutOfBoundsException e)
{

5
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/usercommandhandlers/ChannelDelete.java vendored
View File

@ -44,10 +44,7 @@ public class ChannelDelete implements IUserCommandHandler
if (player.isInParty() && player.getParty().isLeader(player) && player.getParty().isInCommandChannel() && player.getParty().getCommandChannel().getLeader().equals(player))
{
final CommandChannel channel = player.getParty().getCommandChannel();
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_COMMAND_CHANNEL_HAS_BEEN_DISBANDED);
channel.broadcastPacket(sm);
channel.broadcastPacket(new SystemMessage(SystemMessageId.THE_COMMAND_CHANNEL_HAS_BEEN_DISBANDED));
channel.disbandChannel();
return true;
}

1
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/usercommandhandlers/ChannelLeave.java vendored
View File

@ -61,7 +61,6 @@ public class ChannelLeave implements IUserCommandHandler
return true;
}
return false;
}
@Override

3
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ai/AbstractAI.java
View File

@ -667,8 +667,7 @@ public 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
_intention = AI_INTENTION_IDLE;

3
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/PcCafePointsManager.java
View File

@ -41,8 +41,7 @@ public class PcCafePointsManager
if (player.getPcCafePoints() >= Config.PC_CAFE_MAX_POINTS)
{
final SystemMessage message = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_THE_MAXIMUM_NUMBER_OF_PA_POINTS);
player.sendPacket(message);
player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_THE_MAXIMUM_NUMBER_OF_PA_POINTS));
return;
}

4
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/CursedWeapon.java
View File

@ -260,9 +260,9 @@ public class CursedWeapon implements INamable
_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);
Broadcast.toAllOnlinePlayers(packet);
Broadcast.toAllOnlinePlayers(rs);
Broadcast.toAllOnlinePlayers(eq);
}
else

25
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -1817,8 +1817,7 @@ public class PlayerInstance extends Playable
return;
}
_lastCompassZone = ExSetCompassZoneCode.ALTEREDZONE;
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.ALTEREDZONE);
sendPacket(cz);
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.ALTEREDZONE));
}
else if (isInsideZone(ZoneId.SIEGE))
{
@ -1827,8 +1826,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))
{
@ -1837,8 +1835,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 (isInsideZone(ZoneId.PEACE))
{
@ -1847,8 +1844,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
{
@ -1861,8 +1857,7 @@ public class PlayerInstance extends Playable
updatePvPStatus();
}
_lastCompassZone = ExSetCompassZoneCode.GENERALZONE;
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.GENERALZONE);
sendPacket(cz);
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.GENERALZONE));
}
}
@ -4377,8 +4372,7 @@ public class PlayerInstance extends Playable
sendPacket(ActionFailed.STATIC_PACKET);
// Send a Server->Client packet StopMove to this PlayerInstance
final StopMove sm = new StopMove(this);
sendPacket(sm);
sendPacket(new StopMove(this));
SystemMessage smsg = null;
synchronized (target)
@ -10443,7 +10437,6 @@ public class PlayerInstance extends Playable
if (!_snoopListener.isEmpty())
{
final Snoop sn = new Snoop(getObjectId(), getName(), type, name, text);
for (PlayerInstance pci : _snoopListener)
{
if (pci != null)
@ -11744,8 +11737,7 @@ public class PlayerInstance extends Playable
else if (_canFeed)
{
setCurrentFeed(getMaxFeed());
final SetupGauge sg = new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume());
sendPacket(sg);
sendPacket(new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()));
if (!isDead())
{
_mountFeedTask = ThreadPool.scheduleAtFixedRate(new PetFeedTask(this), 10000, 10000);
@ -11804,8 +11796,7 @@ public class PlayerInstance extends Playable
{
final boolean lastHungryState = isHungry();
_curFeed = num > getMaxFeed() ? getMaxFeed() : num;
final SetupGauge sg = new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume());
sendPacket(sg);
sendPacket(new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()));
// broadcast move speed change when strider becomes hungry / full
if (lastHungryState != isHungry())
{

6
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/RaceManagerInstance.java
View File

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

3
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
View File

@ -78,8 +78,7 @@ public class CommandChannelMatchingRoom extends MatchingRoom
p.sendPacket(new ExMPCCRoomMember(player, this));
});
final SystemMessage sm = new SystemMessage(kicked ? SystemMessageId.YOU_WERE_EXPELLED_FROM_THE_COMMAND_CHANNEL_MATCHING_ROOM : SystemMessageId.YOU_EXITED_FROM_THE_COMMAND_CHANNEL_MATCHING_ROOM);
player.sendPacket(sm);
player.sendPacket(new SystemMessage(kicked ? SystemMessageId.YOU_WERE_EXPELLED_FROM_THE_COMMAND_CHANNEL_MATCHING_ROOM : SystemMessageId.YOU_EXITED_FROM_THE_COMMAND_CHANNEL_MATCHING_ROOM));
}
@Override

3
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
View File

@ -84,8 +84,7 @@ public class PartyMatchingRoom extends MatchingRoom
p.sendPacket(SystemMessageId.THE_LEADER_OF_THE_PARTY_ROOM_HAS_CHANGED);
});
final SystemMessage sm2 = new SystemMessage(kicked ? SystemMessageId.YOU_HAVE_BEEN_OUSTED_FROM_THE_PARTY_ROOM : SystemMessageId.YOU_HAVE_EXITED_THE_PARTY_ROOM);
player.sendPacket(sm2);
player.sendPacket(new SystemMessage(kicked ? SystemMessageId.YOU_HAVE_BEEN_OUSTED_FROM_THE_PARTY_ROOM : SystemMessageId.YOU_HAVE_EXITED_THE_PARTY_ROOM));
player.sendPacket(ExClosePartyRoom.STATIC_PACKET);
}

3
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java
View File

@ -194,8 +194,7 @@ public abstract class VoteSystem implements Runnable
private void announce(String msg)
{
final CreatureSay cs = new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg);
Broadcast.toAllOnlinePlayers(cs);
Broadcast.toAllOnlinePlayers(new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg));
}
public abstract int getVotes();

3
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymoreInVehicle.java
View File

@ -56,8 +56,7 @@ public class CannotMoveAnymoreInVehicle implements IClientIncomingPacket
{
player.setInVehiclePosition(new Location(_x, _y, _z));
player.setHeading(_heading);
final StopMoveInVehicle msg = new StopMoveInVehicle(player, _boatId);
player.broadcastPacket(msg);
player.broadcastPacket(new StopMoveInVehicle(player, _boatId));
}
}
}

3
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookDestroy.java
View File

@ -67,7 +67,6 @@ public class RequestRecipeBookDestroy implements IClientIncomingPacket
player.unregisterRecipeList(_recipeID);
// Send the new recipe book.
final RecipeBookItemList response = new RecipeBookItemList(player, rp.isDwarvenRecipe());
player.sendPacket(response);
player.sendPacket(new RecipeBookItemList(player, rp.isDwarvenRecipe()));
}
}

3
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
View File

@ -61,7 +61,6 @@ public class RequestRecipeBookOpen implements IClientIncomingPacket
return;
}
final RecipeBookItemList response = new RecipeBookItemList(player, _isDwarvenCraft);
player.sendPacket(response);
player.sendPacket(new RecipeBookItemList(player, _isDwarvenCraft));
}
}

3
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java
View File

@ -107,8 +107,7 @@ public class RequestAnswerFriendInvite implements IClientIncomingPacket
}
else
{
final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_ADD_A_FRIEND_TO_YOUR_FRIENDS_LIST);
requestor.sendPacket(msg);
requestor.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_ADD_A_FRIEND_TO_YOUR_FRIENDS_LIST));
}
player.setActiveRequester(null);

5
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/FantasyIsle/HandysBlockCheckerEvent.java vendored
View File

@ -74,10 +74,7 @@ public class HandysBlockCheckerEvent extends AbstractNpcAI
if (HandysBlockCheckerManager.getInstance().addPlayerToArena(player, arena))
{
final ArenaParticipantsHolder holder = HandysBlockCheckerManager.getInstance().getHolder(arena);
final ExCubeGameTeamList tl = new ExCubeGameTeamList(holder.getRedPlayers(), holder.getBluePlayers(), arena);
player.sendPacket(tl);
player.sendPacket(new ExCubeGameTeamList(holder.getRedPlayers(), holder.getBluePlayers(), arena));
final int countBlue = holder.getBlueTeamSize();
final int countRed = holder.getRedTeamSize();

6
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java vendored
View File

@ -230,14 +230,12 @@ public class TrainingCamp extends AbstractNpcAI
{
if (player.getLevel() <= Config.TRAINING_CAMP_MIN_LEVEL)
{
final SystemMessage sysMsg = new SystemMessage(SystemMessageId.LV_S1_OR_ABOVE).addInt(Config.TRAINING_CAMP_MIN_LEVEL);
player.sendPacket(sysMsg);
player.sendPacket(new SystemMessage(SystemMessageId.LV_S1_OR_ABOVE).addInt(Config.TRAINING_CAMP_MIN_LEVEL));
return false;
}
else if (player.getLevel() >= Config.TRAINING_CAMP_MAX_LEVEL)
{
final SystemMessage sysMsg = new SystemMessage(SystemMessageId.LV_S1_OR_BELOW).addInt(Config.TRAINING_CAMP_MAX_LEVEL);
player.sendPacket(sysMsg);
player.sendPacket(new SystemMessage(SystemMessageId.LV_S1_OR_BELOW).addInt(Config.TRAINING_CAMP_MAX_LEVEL));
return false;
}
else if (player.isFlyingMounted() || player.isTransformed())

1
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java vendored
View File

@ -125,7 +125,6 @@ public class FreyaCelebration extends LongTimeEvent
{
final CreatureSay cs = new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.DEAR_S1_THINK_OF_THIS_AS_MY_APPRECIATION_FOR_THE_GIFT_TAKE_THIS_WITH_YOU_THERE_S_NOTHING_STRANGE_ABOUT_IT_IT_S_JUST_A_BIT_OF_MY_CAPRICIOUSNESS);
cs.addStringParameter(caster.getName());
npc.broadcastPacket(cs);
caster.addItem("FreyaCelebration", FREYA_GIFT, 1, npc, true);

3
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java vendored
View File

@ -194,8 +194,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)
{

3
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java vendored
View File

@ -113,8 +113,7 @@ public class AdminGmChat implements IAdminCommandHandler
offset = 13;
}
text = command.substring(offset);
final CreatureSay cs = new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text);
AdminData.getInstance().broadcastToGMs(cs);
AdminData.getInstance().broadcastToGMs(new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text));
}
catch (StringIndexOutOfBoundsException e)
{

5
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/usercommandhandlers/ChannelDelete.java vendored
View File

@ -44,10 +44,7 @@ public class ChannelDelete implements IUserCommandHandler
if (player.isInParty() && player.getParty().isLeader(player) && player.getParty().isInCommandChannel() && player.getParty().getCommandChannel().getLeader().equals(player))
{
final CommandChannel channel = player.getParty().getCommandChannel();
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_COMMAND_CHANNEL_HAS_BEEN_DISBANDED);
channel.broadcastPacket(sm);
channel.broadcastPacket(new SystemMessage(SystemMessageId.THE_COMMAND_CHANNEL_HAS_BEEN_DISBANDED));
channel.disbandChannel();
return true;
}

1
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/usercommandhandlers/ChannelLeave.java vendored
View File

@ -61,7 +61,6 @@ public class ChannelLeave implements IUserCommandHandler
return true;
}
return false;
}
@Override

3
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ai/AbstractAI.java
View File

@ -667,8 +667,7 @@ public 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
_intention = AI_INTENTION_IDLE;

3
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/PcCafePointsManager.java
View File

@ -41,8 +41,7 @@ public class PcCafePointsManager
if (player.getPcCafePoints() >= Config.PC_CAFE_MAX_POINTS)
{
final SystemMessage message = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_THE_MAXIMUM_NUMBER_OF_PA_POINTS);
player.sendPacket(message);
player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_THE_MAXIMUM_NUMBER_OF_PA_POINTS));
return;
}

4
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/CursedWeapon.java
View File

@ -260,9 +260,9 @@ public class CursedWeapon implements INamable
_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);
Broadcast.toAllOnlinePlayers(packet);
Broadcast.toAllOnlinePlayers(rs);
Broadcast.toAllOnlinePlayers(eq);
}
else

25
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -1817,8 +1817,7 @@ public class PlayerInstance extends Playable
return;
}
_lastCompassZone = ExSetCompassZoneCode.ALTEREDZONE;
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.ALTEREDZONE);
sendPacket(cz);
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.ALTEREDZONE));
}
else if (isInsideZone(ZoneId.SIEGE))
{
@ -1827,8 +1826,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))
{
@ -1837,8 +1835,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 (isInsideZone(ZoneId.PEACE))
{
@ -1847,8 +1844,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
{
@ -1861,8 +1857,7 @@ public class PlayerInstance extends Playable
updatePvPStatus();
}
_lastCompassZone = ExSetCompassZoneCode.GENERALZONE;
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.GENERALZONE);
sendPacket(cz);
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.GENERALZONE));
}
}
@ -4377,8 +4372,7 @@ public class PlayerInstance extends Playable
sendPacket(ActionFailed.STATIC_PACKET);
// Send a Server->Client packet StopMove to this PlayerInstance
final StopMove sm = new StopMove(this);
sendPacket(sm);
sendPacket(new StopMove(this));
SystemMessage smsg = null;
synchronized (target)
@ -10446,7 +10440,6 @@ public class PlayerInstance extends Playable
if (!_snoopListener.isEmpty())
{
final Snoop sn = new Snoop(getObjectId(), getName(), type, name, text);
for (PlayerInstance pci : _snoopListener)
{
if (pci != null)
@ -11747,8 +11740,7 @@ public class PlayerInstance extends Playable
else if (_canFeed)
{
setCurrentFeed(getMaxFeed());
final SetupGauge sg = new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume());
sendPacket(sg);
sendPacket(new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()));
if (!isDead())
{
_mountFeedTask = ThreadPool.scheduleAtFixedRate(new PetFeedTask(this), 10000, 10000);
@ -11807,8 +11799,7 @@ public class PlayerInstance extends Playable
{
final boolean lastHungryState = isHungry();
_curFeed = num > getMaxFeed() ? getMaxFeed() : num;
final SetupGauge sg = new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume());
sendPacket(sg);
sendPacket(new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()));
// broadcast move speed change when strider becomes hungry / full
if (lastHungryState != isHungry())
{

6
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/RaceManagerInstance.java
View File

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

3
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
View File

@ -78,8 +78,7 @@ public class CommandChannelMatchingRoom extends MatchingRoom
p.sendPacket(new ExMPCCRoomMember(player, this));
});
final SystemMessage sm = new SystemMessage(kicked ? SystemMessageId.YOU_WERE_EXPELLED_FROM_THE_COMMAND_CHANNEL_MATCHING_ROOM : SystemMessageId.YOU_EXITED_FROM_THE_COMMAND_CHANNEL_MATCHING_ROOM);
player.sendPacket(sm);
player.sendPacket(new SystemMessage(kicked ? SystemMessageId.YOU_WERE_EXPELLED_FROM_THE_COMMAND_CHANNEL_MATCHING_ROOM : SystemMessageId.YOU_EXITED_FROM_THE_COMMAND_CHANNEL_MATCHING_ROOM));
}
@Override

3
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
View File

@ -84,8 +84,7 @@ public class PartyMatchingRoom extends MatchingRoom
p.sendPacket(SystemMessageId.THE_LEADER_OF_THE_PARTY_ROOM_HAS_CHANGED);
});
final SystemMessage sm2 = new SystemMessage(kicked ? SystemMessageId.YOU_HAVE_BEEN_OUSTED_FROM_THE_PARTY_ROOM : SystemMessageId.YOU_HAVE_EXITED_THE_PARTY_ROOM);
player.sendPacket(sm2);
player.sendPacket(new SystemMessage(kicked ? SystemMessageId.YOU_HAVE_BEEN_OUSTED_FROM_THE_PARTY_ROOM : SystemMessageId.YOU_HAVE_EXITED_THE_PARTY_ROOM));
player.sendPacket(ExClosePartyRoom.STATIC_PACKET);
}

3
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java
View File

@ -194,8 +194,7 @@ public abstract class VoteSystem implements Runnable
private void announce(String msg)
{
final CreatureSay cs = new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg);
Broadcast.toAllOnlinePlayers(cs);
Broadcast.toAllOnlinePlayers(new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg));
}
public abstract int getVotes();

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