Removed pointless assignments before packet send.
This commit is contained in:
Vendored
+1
-4
@@ -74,10 +74,7 @@ public class HandysBlockCheckerEvent extends AbstractNpcAI
|
|||||||
if (HandysBlockCheckerManager.getInstance().addPlayerToArena(player, arena))
|
if (HandysBlockCheckerManager.getInstance().addPlayerToArena(player, arena))
|
||||||
{
|
{
|
||||||
final ArenaParticipantsHolder holder = HandysBlockCheckerManager.getInstance().getHolder(arena);
|
final ArenaParticipantsHolder holder = HandysBlockCheckerManager.getInstance().getHolder(arena);
|
||||||
|
player.sendPacket(new ExCubeGameTeamList(holder.getRedPlayers(), holder.getBluePlayers(), arena));
|
||||||
final ExCubeGameTeamList tl = new ExCubeGameTeamList(holder.getRedPlayers(), holder.getBluePlayers(), arena);
|
|
||||||
|
|
||||||
player.sendPacket(tl);
|
|
||||||
|
|
||||||
final int countBlue = holder.getBlueTeamSize();
|
final int countBlue = holder.getBlueTeamSize();
|
||||||
final int countRed = holder.getRedTeamSize();
|
final int countRed = holder.getRedTeamSize();
|
||||||
|
|||||||
+2
-4
@@ -230,14 +230,12 @@ public class TrainingCamp extends AbstractNpcAI
|
|||||||
{
|
{
|
||||||
if (player.getLevel() <= Config.TRAINING_CAMP_MIN_LEVEL)
|
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(new SystemMessage(SystemMessageId.LV_S1_OR_ABOVE).addInt(Config.TRAINING_CAMP_MIN_LEVEL));
|
||||||
player.sendPacket(sysMsg);
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
else if (player.getLevel() >= Config.TRAINING_CAMP_MAX_LEVEL)
|
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(new SystemMessage(SystemMessageId.LV_S1_OR_BELOW).addInt(Config.TRAINING_CAMP_MAX_LEVEL));
|
||||||
player.sendPacket(sysMsg);
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
else if (player.isFlyingMounted() || player.isTransformed())
|
else if (player.isFlyingMounted() || player.isTransformed())
|
||||||
|
|||||||
Vendored
-1
@@ -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);
|
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());
|
cs.addStringParameter(caster.getName());
|
||||||
|
|
||||||
npc.broadcastPacket(cs);
|
npc.broadcastPacket(cs);
|
||||||
|
|
||||||
caster.addItem("FreyaCelebration", FREYA_GIFT, 1, npc, true);
|
caster.addItem("FreyaCelebration", FREYA_GIFT, 1, npc, true);
|
||||||
|
|||||||
Vendored
+1
-2
@@ -194,8 +194,7 @@ public class AdminEffects implements IAdminCommandHandler
|
|||||||
final int intensity = Integer.parseInt(val1);
|
final int intensity = Integer.parseInt(val1);
|
||||||
final String val2 = st.nextToken();
|
final String val2 = st.nextToken();
|
||||||
final int duration = Integer.parseInt(val2);
|
final int duration = Integer.parseInt(val2);
|
||||||
final Earthquake eq = new Earthquake(activeChar.getX(), activeChar.getY(), activeChar.getZ(), intensity, duration);
|
activeChar.broadcastPacket(new Earthquake(activeChar.getX(), activeChar.getY(), activeChar.getZ(), intensity, duration));
|
||||||
activeChar.broadcastPacket(eq);
|
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
|
|||||||
Vendored
+1
-2
@@ -113,8 +113,7 @@ public class AdminGmChat implements IAdminCommandHandler
|
|||||||
offset = 13;
|
offset = 13;
|
||||||
}
|
}
|
||||||
text = command.substring(offset);
|
text = command.substring(offset);
|
||||||
final CreatureSay cs = new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text);
|
AdminData.getInstance().broadcastToGMs(new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text));
|
||||||
AdminData.getInstance().broadcastToGMs(cs);
|
|
||||||
}
|
}
|
||||||
catch (StringIndexOutOfBoundsException e)
|
catch (StringIndexOutOfBoundsException e)
|
||||||
{
|
{
|
||||||
|
|||||||
Vendored
+1
-4
@@ -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))
|
if (player.isInParty() && player.getParty().isLeader(player) && player.getParty().isInCommandChannel() && player.getParty().getCommandChannel().getLeader().equals(player))
|
||||||
{
|
{
|
||||||
final CommandChannel channel = player.getParty().getCommandChannel();
|
final CommandChannel channel = player.getParty().getCommandChannel();
|
||||||
|
channel.broadcastPacket(new SystemMessage(SystemMessageId.THE_COMMAND_CHANNEL_HAS_BEEN_DISBANDED));
|
||||||
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_COMMAND_CHANNEL_HAS_BEEN_DISBANDED);
|
|
||||||
channel.broadcastPacket(sm);
|
|
||||||
|
|
||||||
channel.disbandChannel();
|
channel.disbandChannel();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
Vendored
-1
@@ -61,7 +61,6 @@ public class ChannelLeave implements IUserCommandHandler
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -667,8 +667,7 @@ public abstract class AbstractAI implements Ctrl
|
|||||||
protected void clientNotifyDead()
|
protected void clientNotifyDead()
|
||||||
{
|
{
|
||||||
// Send a Server->Client packet Die to the actor and all PlayerInstance in its _knownPlayers
|
// Send a Server->Client packet Die to the actor and all PlayerInstance in its _knownPlayers
|
||||||
final Die msg = new Die(_actor);
|
_actor.broadcastPacket(new Die(_actor));
|
||||||
_actor.broadcastPacket(msg);
|
|
||||||
|
|
||||||
// Init AI
|
// Init AI
|
||||||
_intention = AI_INTENTION_IDLE;
|
_intention = AI_INTENTION_IDLE;
|
||||||
|
|||||||
@@ -260,9 +260,9 @@ public class CursedWeapon implements INamable
|
|||||||
_item.setDropTime(0); // Prevent item from being removed by ItemsAutoDestroy
|
_item.setDropTime(0); // Prevent item from being removed by ItemsAutoDestroy
|
||||||
|
|
||||||
// RedSky and Earthquake
|
// 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);
|
final Earthquake eq = new Earthquake(player.getX(), player.getY(), player.getZ(), 14, 3);
|
||||||
Broadcast.toAllOnlinePlayers(packet);
|
Broadcast.toAllOnlinePlayers(rs);
|
||||||
Broadcast.toAllOnlinePlayers(eq);
|
Broadcast.toAllOnlinePlayers(eq);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
+8
-16
@@ -1807,8 +1807,7 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
_lastCompassZone = ExSetCompassZoneCode.ALTEREDZONE;
|
_lastCompassZone = ExSetCompassZoneCode.ALTEREDZONE;
|
||||||
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.ALTEREDZONE);
|
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.ALTEREDZONE));
|
||||||
sendPacket(cz);
|
|
||||||
}
|
}
|
||||||
else if (isInsideZone(ZoneId.SIEGE))
|
else if (isInsideZone(ZoneId.SIEGE))
|
||||||
{
|
{
|
||||||
@@ -1817,8 +1816,7 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
_lastCompassZone = ExSetCompassZoneCode.SIEGEWARZONE2;
|
_lastCompassZone = ExSetCompassZoneCode.SIEGEWARZONE2;
|
||||||
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.SIEGEWARZONE2);
|
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.SIEGEWARZONE2));
|
||||||
sendPacket(cz);
|
|
||||||
}
|
}
|
||||||
else if (isInsideZone(ZoneId.PVP))
|
else if (isInsideZone(ZoneId.PVP))
|
||||||
{
|
{
|
||||||
@@ -1827,8 +1825,7 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
_lastCompassZone = ExSetCompassZoneCode.PVPZONE;
|
_lastCompassZone = ExSetCompassZoneCode.PVPZONE;
|
||||||
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.PVPZONE);
|
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.PVPZONE));
|
||||||
sendPacket(cz);
|
|
||||||
}
|
}
|
||||||
else if (isInsideZone(ZoneId.PEACE))
|
else if (isInsideZone(ZoneId.PEACE))
|
||||||
{
|
{
|
||||||
@@ -1837,8 +1834,7 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
_lastCompassZone = ExSetCompassZoneCode.PEACEZONE;
|
_lastCompassZone = ExSetCompassZoneCode.PEACEZONE;
|
||||||
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.PEACEZONE);
|
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.PEACEZONE));
|
||||||
sendPacket(cz);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -1851,8 +1847,7 @@ public class PlayerInstance extends Playable
|
|||||||
updatePvPStatus();
|
updatePvPStatus();
|
||||||
}
|
}
|
||||||
_lastCompassZone = ExSetCompassZoneCode.GENERALZONE;
|
_lastCompassZone = ExSetCompassZoneCode.GENERALZONE;
|
||||||
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.GENERALZONE);
|
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.GENERALZONE));
|
||||||
sendPacket(cz);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4402,8 +4397,7 @@ public class PlayerInstance extends Playable
|
|||||||
sendPacket(ActionFailed.STATIC_PACKET);
|
sendPacket(ActionFailed.STATIC_PACKET);
|
||||||
|
|
||||||
// Send a Server->Client packet StopMove to this PlayerInstance
|
// Send a Server->Client packet StopMove to this PlayerInstance
|
||||||
final StopMove sm = new StopMove(this);
|
sendPacket(new StopMove(this));
|
||||||
sendPacket(sm);
|
|
||||||
|
|
||||||
SystemMessage smsg = null;
|
SystemMessage smsg = null;
|
||||||
synchronized (target)
|
synchronized (target)
|
||||||
@@ -11781,8 +11775,7 @@ public class PlayerInstance extends Playable
|
|||||||
else if (_canFeed)
|
else if (_canFeed)
|
||||||
{
|
{
|
||||||
setCurrentFeed(getMaxFeed());
|
setCurrentFeed(getMaxFeed());
|
||||||
final SetupGauge sg = new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume());
|
sendPacket(new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()));
|
||||||
sendPacket(sg);
|
|
||||||
if (!isDead())
|
if (!isDead())
|
||||||
{
|
{
|
||||||
_mountFeedTask = ThreadPool.scheduleAtFixedRate(new PetFeedTask(this), 10000, 10000);
|
_mountFeedTask = ThreadPool.scheduleAtFixedRate(new PetFeedTask(this), 10000, 10000);
|
||||||
@@ -11841,8 +11834,7 @@ public class PlayerInstance extends Playable
|
|||||||
{
|
{
|
||||||
final boolean lastHungryState = isHungry();
|
final boolean lastHungryState = isHungry();
|
||||||
_curFeed = num > getMaxFeed() ? getMaxFeed() : num;
|
_curFeed = num > getMaxFeed() ? getMaxFeed() : num;
|
||||||
final SetupGauge sg = new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume());
|
sendPacket(new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()));
|
||||||
sendPacket(sg);
|
|
||||||
// broadcast move speed change when strider becomes hungry / full
|
// broadcast move speed change when strider becomes hungry / full
|
||||||
if (lastHungryState != isHungry())
|
if (lastHungryState != isHungry())
|
||||||
{
|
{
|
||||||
|
|||||||
+2
-4
@@ -246,10 +246,8 @@ public class RaceManagerInstance extends Npc
|
|||||||
if (_state == STARTING_RACE)
|
if (_state == STARTING_RACE)
|
||||||
{
|
{
|
||||||
// state++;
|
// state++;
|
||||||
final PlaySound sRace = new PlaySound(1, "S_Race", 0, 0, 0, 0, 0);
|
broadcast(new PlaySound(1, "S_Race", 0, 0, 0, 0, 0));
|
||||||
broadcast(sRace);
|
broadcast(new PlaySound(0, "ItemSound2.race_start", 1, 121209259, 12125, 182487, -3559));
|
||||||
final PlaySound sRace2 = new PlaySound(0, "ItemSound2.race_start", 1, 121209259, 12125, 182487, -3559);
|
|
||||||
broadcast(sRace2);
|
|
||||||
_packet = new MonRaceInfo(_codes[1][0], _codes[1][1], race.getMonsters(), race.getSpeeds());
|
_packet = new MonRaceInfo(_codes[1][0], _codes[1][1], race.getMonsters(), race.getSpeeds());
|
||||||
sendMonsterInfo();
|
sendMonsterInfo();
|
||||||
|
|
||||||
|
|||||||
+1
-2
@@ -78,8 +78,7 @@ public class CommandChannelMatchingRoom extends MatchingRoom
|
|||||||
p.sendPacket(new ExMPCCRoomMember(player, this));
|
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(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);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
+1
-2
@@ -84,8 +84,7 @@ public class PartyMatchingRoom extends MatchingRoom
|
|||||||
p.sendPacket(SystemMessageId.THE_LEADER_OF_THE_PARTY_ROOM_HAS_CHANGED);
|
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(new SystemMessage(kicked ? SystemMessageId.YOU_HAVE_BEEN_OUSTED_FROM_THE_PARTY_ROOM : SystemMessageId.YOU_HAVE_EXITED_THE_PARTY_ROOM));
|
||||||
player.sendPacket(sm2);
|
|
||||||
player.sendPacket(ExClosePartyRoom.STATIC_PACKET);
|
player.sendPacket(ExClosePartyRoom.STATIC_PACKET);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-2
@@ -194,8 +194,7 @@ public abstract class VoteSystem implements Runnable
|
|||||||
|
|
||||||
private void announce(String msg)
|
private void announce(String msg)
|
||||||
{
|
{
|
||||||
final CreatureSay cs = new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg);
|
Broadcast.toAllOnlinePlayers(new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg));
|
||||||
Broadcast.toAllOnlinePlayers(cs);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public abstract int getVotes();
|
public abstract int getVotes();
|
||||||
|
|||||||
+1
-2
@@ -56,8 +56,7 @@ public class CannotMoveAnymoreInVehicle implements IClientIncomingPacket
|
|||||||
{
|
{
|
||||||
player.setInVehiclePosition(new Location(_x, _y, _z));
|
player.setInVehiclePosition(new Location(_x, _y, _z));
|
||||||
player.setHeading(_heading);
|
player.setHeading(_heading);
|
||||||
final StopMoveInVehicle msg = new StopMoveInVehicle(player, _boatId);
|
player.broadcastPacket(new StopMoveInVehicle(player, _boatId));
|
||||||
player.broadcastPacket(msg);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-2
@@ -107,8 +107,7 @@ public class RequestAnswerFriendInvite implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_ADD_A_FRIEND_TO_YOUR_FRIENDS_LIST);
|
requestor.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_ADD_A_FRIEND_TO_YOUR_FRIENDS_LIST));
|
||||||
requestor.sendPacket(msg);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
player.setActiveRequester(null);
|
player.setActiveRequester(null);
|
||||||
|
|||||||
Vendored
+1
-4
@@ -74,10 +74,7 @@ public class HandysBlockCheckerEvent extends AbstractNpcAI
|
|||||||
if (HandysBlockCheckerManager.getInstance().addPlayerToArena(player, arena))
|
if (HandysBlockCheckerManager.getInstance().addPlayerToArena(player, arena))
|
||||||
{
|
{
|
||||||
final ArenaParticipantsHolder holder = HandysBlockCheckerManager.getInstance().getHolder(arena);
|
final ArenaParticipantsHolder holder = HandysBlockCheckerManager.getInstance().getHolder(arena);
|
||||||
|
player.sendPacket(new ExCubeGameTeamList(holder.getRedPlayers(), holder.getBluePlayers(), arena));
|
||||||
final ExCubeGameTeamList tl = new ExCubeGameTeamList(holder.getRedPlayers(), holder.getBluePlayers(), arena);
|
|
||||||
|
|
||||||
player.sendPacket(tl);
|
|
||||||
|
|
||||||
final int countBlue = holder.getBlueTeamSize();
|
final int countBlue = holder.getBlueTeamSize();
|
||||||
final int countRed = holder.getRedTeamSize();
|
final int countRed = holder.getRedTeamSize();
|
||||||
|
|||||||
+2
-4
@@ -230,14 +230,12 @@ public class TrainingCamp extends AbstractNpcAI
|
|||||||
{
|
{
|
||||||
if (player.getLevel() <= Config.TRAINING_CAMP_MIN_LEVEL)
|
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(new SystemMessage(SystemMessageId.LV_S1_OR_ABOVE).addInt(Config.TRAINING_CAMP_MIN_LEVEL));
|
||||||
player.sendPacket(sysMsg);
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
else if (player.getLevel() >= Config.TRAINING_CAMP_MAX_LEVEL)
|
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(new SystemMessage(SystemMessageId.LV_S1_OR_BELOW).addInt(Config.TRAINING_CAMP_MAX_LEVEL));
|
||||||
player.sendPacket(sysMsg);
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
else if (player.isFlyingMounted() || player.isTransformed())
|
else if (player.isFlyingMounted() || player.isTransformed())
|
||||||
|
|||||||
Vendored
-1
@@ -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);
|
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());
|
cs.addStringParameter(caster.getName());
|
||||||
|
|
||||||
npc.broadcastPacket(cs);
|
npc.broadcastPacket(cs);
|
||||||
|
|
||||||
caster.addItem("FreyaCelebration", FREYA_GIFT, 1, npc, true);
|
caster.addItem("FreyaCelebration", FREYA_GIFT, 1, npc, true);
|
||||||
|
|||||||
Vendored
+1
-2
@@ -194,8 +194,7 @@ public class AdminEffects implements IAdminCommandHandler
|
|||||||
final int intensity = Integer.parseInt(val1);
|
final int intensity = Integer.parseInt(val1);
|
||||||
final String val2 = st.nextToken();
|
final String val2 = st.nextToken();
|
||||||
final int duration = Integer.parseInt(val2);
|
final int duration = Integer.parseInt(val2);
|
||||||
final Earthquake eq = new Earthquake(activeChar.getX(), activeChar.getY(), activeChar.getZ(), intensity, duration);
|
activeChar.broadcastPacket(new Earthquake(activeChar.getX(), activeChar.getY(), activeChar.getZ(), intensity, duration));
|
||||||
activeChar.broadcastPacket(eq);
|
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
|
|||||||
Vendored
+1
-2
@@ -113,8 +113,7 @@ public class AdminGmChat implements IAdminCommandHandler
|
|||||||
offset = 13;
|
offset = 13;
|
||||||
}
|
}
|
||||||
text = command.substring(offset);
|
text = command.substring(offset);
|
||||||
final CreatureSay cs = new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text);
|
AdminData.getInstance().broadcastToGMs(new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text));
|
||||||
AdminData.getInstance().broadcastToGMs(cs);
|
|
||||||
}
|
}
|
||||||
catch (StringIndexOutOfBoundsException e)
|
catch (StringIndexOutOfBoundsException e)
|
||||||
{
|
{
|
||||||
|
|||||||
Vendored
+1
-4
@@ -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))
|
if (player.isInParty() && player.getParty().isLeader(player) && player.getParty().isInCommandChannel() && player.getParty().getCommandChannel().getLeader().equals(player))
|
||||||
{
|
{
|
||||||
final CommandChannel channel = player.getParty().getCommandChannel();
|
final CommandChannel channel = player.getParty().getCommandChannel();
|
||||||
|
channel.broadcastPacket(new SystemMessage(SystemMessageId.THE_COMMAND_CHANNEL_HAS_BEEN_DISBANDED));
|
||||||
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_COMMAND_CHANNEL_HAS_BEEN_DISBANDED);
|
|
||||||
channel.broadcastPacket(sm);
|
|
||||||
|
|
||||||
channel.disbandChannel();
|
channel.disbandChannel();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
Vendored
-1
@@ -61,7 +61,6 @@ public class ChannelLeave implements IUserCommandHandler
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -667,8 +667,7 @@ public abstract class AbstractAI implements Ctrl
|
|||||||
protected void clientNotifyDead()
|
protected void clientNotifyDead()
|
||||||
{
|
{
|
||||||
// Send a Server->Client packet Die to the actor and all PlayerInstance in its _knownPlayers
|
// Send a Server->Client packet Die to the actor and all PlayerInstance in its _knownPlayers
|
||||||
final Die msg = new Die(_actor);
|
_actor.broadcastPacket(new Die(_actor));
|
||||||
_actor.broadcastPacket(msg);
|
|
||||||
|
|
||||||
// Init AI
|
// Init AI
|
||||||
_intention = AI_INTENTION_IDLE;
|
_intention = AI_INTENTION_IDLE;
|
||||||
|
|||||||
@@ -260,9 +260,9 @@ public class CursedWeapon implements INamable
|
|||||||
_item.setDropTime(0); // Prevent item from being removed by ItemsAutoDestroy
|
_item.setDropTime(0); // Prevent item from being removed by ItemsAutoDestroy
|
||||||
|
|
||||||
// RedSky and Earthquake
|
// 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);
|
final Earthquake eq = new Earthquake(player.getX(), player.getY(), player.getZ(), 14, 3);
|
||||||
Broadcast.toAllOnlinePlayers(packet);
|
Broadcast.toAllOnlinePlayers(rs);
|
||||||
Broadcast.toAllOnlinePlayers(eq);
|
Broadcast.toAllOnlinePlayers(eq);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
+8
-16
@@ -1813,8 +1813,7 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
_lastCompassZone = ExSetCompassZoneCode.ALTEREDZONE;
|
_lastCompassZone = ExSetCompassZoneCode.ALTEREDZONE;
|
||||||
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.ALTEREDZONE);
|
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.ALTEREDZONE));
|
||||||
sendPacket(cz);
|
|
||||||
}
|
}
|
||||||
else if (isInsideZone(ZoneId.SIEGE))
|
else if (isInsideZone(ZoneId.SIEGE))
|
||||||
{
|
{
|
||||||
@@ -1823,8 +1822,7 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
_lastCompassZone = ExSetCompassZoneCode.SIEGEWARZONE2;
|
_lastCompassZone = ExSetCompassZoneCode.SIEGEWARZONE2;
|
||||||
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.SIEGEWARZONE2);
|
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.SIEGEWARZONE2));
|
||||||
sendPacket(cz);
|
|
||||||
}
|
}
|
||||||
else if (isInsideZone(ZoneId.PVP))
|
else if (isInsideZone(ZoneId.PVP))
|
||||||
{
|
{
|
||||||
@@ -1833,8 +1831,7 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
_lastCompassZone = ExSetCompassZoneCode.PVPZONE;
|
_lastCompassZone = ExSetCompassZoneCode.PVPZONE;
|
||||||
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.PVPZONE);
|
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.PVPZONE));
|
||||||
sendPacket(cz);
|
|
||||||
}
|
}
|
||||||
else if (isInsideZone(ZoneId.PEACE))
|
else if (isInsideZone(ZoneId.PEACE))
|
||||||
{
|
{
|
||||||
@@ -1843,8 +1840,7 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
_lastCompassZone = ExSetCompassZoneCode.PEACEZONE;
|
_lastCompassZone = ExSetCompassZoneCode.PEACEZONE;
|
||||||
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.PEACEZONE);
|
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.PEACEZONE));
|
||||||
sendPacket(cz);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -1857,8 +1853,7 @@ public class PlayerInstance extends Playable
|
|||||||
updatePvPStatus();
|
updatePvPStatus();
|
||||||
}
|
}
|
||||||
_lastCompassZone = ExSetCompassZoneCode.GENERALZONE;
|
_lastCompassZone = ExSetCompassZoneCode.GENERALZONE;
|
||||||
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.GENERALZONE);
|
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.GENERALZONE));
|
||||||
sendPacket(cz);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4408,8 +4403,7 @@ public class PlayerInstance extends Playable
|
|||||||
sendPacket(ActionFailed.STATIC_PACKET);
|
sendPacket(ActionFailed.STATIC_PACKET);
|
||||||
|
|
||||||
// Send a Server->Client packet StopMove to this PlayerInstance
|
// Send a Server->Client packet StopMove to this PlayerInstance
|
||||||
final StopMove sm = new StopMove(this);
|
sendPacket(new StopMove(this));
|
||||||
sendPacket(sm);
|
|
||||||
|
|
||||||
SystemMessage smsg = null;
|
SystemMessage smsg = null;
|
||||||
synchronized (target)
|
synchronized (target)
|
||||||
@@ -11788,8 +11782,7 @@ public class PlayerInstance extends Playable
|
|||||||
else if (_canFeed)
|
else if (_canFeed)
|
||||||
{
|
{
|
||||||
setCurrentFeed(getMaxFeed());
|
setCurrentFeed(getMaxFeed());
|
||||||
final SetupGauge sg = new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume());
|
sendPacket(new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()));
|
||||||
sendPacket(sg);
|
|
||||||
if (!isDead())
|
if (!isDead())
|
||||||
{
|
{
|
||||||
_mountFeedTask = ThreadPool.scheduleAtFixedRate(new PetFeedTask(this), 10000, 10000);
|
_mountFeedTask = ThreadPool.scheduleAtFixedRate(new PetFeedTask(this), 10000, 10000);
|
||||||
@@ -11848,8 +11841,7 @@ public class PlayerInstance extends Playable
|
|||||||
{
|
{
|
||||||
final boolean lastHungryState = isHungry();
|
final boolean lastHungryState = isHungry();
|
||||||
_curFeed = num > getMaxFeed() ? getMaxFeed() : num;
|
_curFeed = num > getMaxFeed() ? getMaxFeed() : num;
|
||||||
final SetupGauge sg = new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume());
|
sendPacket(new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()));
|
||||||
sendPacket(sg);
|
|
||||||
// broadcast move speed change when strider becomes hungry / full
|
// broadcast move speed change when strider becomes hungry / full
|
||||||
if (lastHungryState != isHungry())
|
if (lastHungryState != isHungry())
|
||||||
{
|
{
|
||||||
|
|||||||
+2
-4
@@ -246,10 +246,8 @@ public class RaceManagerInstance extends Npc
|
|||||||
if (_state == STARTING_RACE)
|
if (_state == STARTING_RACE)
|
||||||
{
|
{
|
||||||
// state++;
|
// state++;
|
||||||
final PlaySound sRace = new PlaySound(1, "S_Race", 0, 0, 0, 0, 0);
|
broadcast(new PlaySound(1, "S_Race", 0, 0, 0, 0, 0));
|
||||||
broadcast(sRace);
|
broadcast(new PlaySound(0, "ItemSound2.race_start", 1, 121209259, 12125, 182487, -3559));
|
||||||
final PlaySound sRace2 = new PlaySound(0, "ItemSound2.race_start", 1, 121209259, 12125, 182487, -3559);
|
|
||||||
broadcast(sRace2);
|
|
||||||
_packet = new MonRaceInfo(_codes[1][0], _codes[1][1], race.getMonsters(), race.getSpeeds());
|
_packet = new MonRaceInfo(_codes[1][0], _codes[1][1], race.getMonsters(), race.getSpeeds());
|
||||||
sendMonsterInfo();
|
sendMonsterInfo();
|
||||||
|
|
||||||
|
|||||||
+1
-2
@@ -78,8 +78,7 @@ public class CommandChannelMatchingRoom extends MatchingRoom
|
|||||||
p.sendPacket(new ExMPCCRoomMember(player, this));
|
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(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);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
+1
-2
@@ -84,8 +84,7 @@ public class PartyMatchingRoom extends MatchingRoom
|
|||||||
p.sendPacket(SystemMessageId.THE_LEADER_OF_THE_PARTY_ROOM_HAS_CHANGED);
|
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(new SystemMessage(kicked ? SystemMessageId.YOU_HAVE_BEEN_OUSTED_FROM_THE_PARTY_ROOM : SystemMessageId.YOU_HAVE_EXITED_THE_PARTY_ROOM));
|
||||||
player.sendPacket(sm2);
|
|
||||||
player.sendPacket(ExClosePartyRoom.STATIC_PACKET);
|
player.sendPacket(ExClosePartyRoom.STATIC_PACKET);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-2
@@ -194,8 +194,7 @@ public abstract class VoteSystem implements Runnable
|
|||||||
|
|
||||||
private void announce(String msg)
|
private void announce(String msg)
|
||||||
{
|
{
|
||||||
final CreatureSay cs = new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg);
|
Broadcast.toAllOnlinePlayers(new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg));
|
||||||
Broadcast.toAllOnlinePlayers(cs);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public abstract int getVotes();
|
public abstract int getVotes();
|
||||||
|
|||||||
+1
-2
@@ -56,8 +56,7 @@ public class CannotMoveAnymoreInVehicle implements IClientIncomingPacket
|
|||||||
{
|
{
|
||||||
player.setInVehiclePosition(new Location(_x, _y, _z));
|
player.setInVehiclePosition(new Location(_x, _y, _z));
|
||||||
player.setHeading(_heading);
|
player.setHeading(_heading);
|
||||||
final StopMoveInVehicle msg = new StopMoveInVehicle(player, _boatId);
|
player.broadcastPacket(new StopMoveInVehicle(player, _boatId));
|
||||||
player.broadcastPacket(msg);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-2
@@ -107,8 +107,7 @@ public class RequestAnswerFriendInvite implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_ADD_A_FRIEND_TO_YOUR_FRIENDS_LIST);
|
requestor.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_ADD_A_FRIEND_TO_YOUR_FRIENDS_LIST));
|
||||||
requestor.sendPacket(msg);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
player.setActiveRequester(null);
|
player.setActiveRequester(null);
|
||||||
|
|||||||
Vendored
+1
-4
@@ -74,10 +74,7 @@ public class HandysBlockCheckerEvent extends AbstractNpcAI
|
|||||||
if (HandysBlockCheckerManager.getInstance().addPlayerToArena(player, arena))
|
if (HandysBlockCheckerManager.getInstance().addPlayerToArena(player, arena))
|
||||||
{
|
{
|
||||||
final ArenaParticipantsHolder holder = HandysBlockCheckerManager.getInstance().getHolder(arena);
|
final ArenaParticipantsHolder holder = HandysBlockCheckerManager.getInstance().getHolder(arena);
|
||||||
|
player.sendPacket(new ExCubeGameTeamList(holder.getRedPlayers(), holder.getBluePlayers(), arena));
|
||||||
final ExCubeGameTeamList tl = new ExCubeGameTeamList(holder.getRedPlayers(), holder.getBluePlayers(), arena);
|
|
||||||
|
|
||||||
player.sendPacket(tl);
|
|
||||||
|
|
||||||
final int countBlue = holder.getBlueTeamSize();
|
final int countBlue = holder.getBlueTeamSize();
|
||||||
final int countRed = holder.getRedTeamSize();
|
final int countRed = holder.getRedTeamSize();
|
||||||
|
|||||||
+2
-4
@@ -230,14 +230,12 @@ public class TrainingCamp extends AbstractNpcAI
|
|||||||
{
|
{
|
||||||
if (player.getLevel() <= Config.TRAINING_CAMP_MIN_LEVEL)
|
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(new SystemMessage(SystemMessageId.LV_S1_OR_ABOVE).addInt(Config.TRAINING_CAMP_MIN_LEVEL));
|
||||||
player.sendPacket(sysMsg);
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
else if (player.getLevel() >= Config.TRAINING_CAMP_MAX_LEVEL)
|
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(new SystemMessage(SystemMessageId.LV_S1_OR_BELOW).addInt(Config.TRAINING_CAMP_MAX_LEVEL));
|
||||||
player.sendPacket(sysMsg);
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
else if (player.isFlyingMounted() || player.isTransformed())
|
else if (player.isFlyingMounted() || player.isTransformed())
|
||||||
|
|||||||
-1
@@ -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);
|
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());
|
cs.addStringParameter(caster.getName());
|
||||||
|
|
||||||
npc.broadcastPacket(cs);
|
npc.broadcastPacket(cs);
|
||||||
|
|
||||||
caster.addItem("FreyaCelebration", FREYA_GIFT, 1, npc, true);
|
caster.addItem("FreyaCelebration", FREYA_GIFT, 1, npc, true);
|
||||||
|
|||||||
Vendored
+1
-2
@@ -194,8 +194,7 @@ public class AdminEffects implements IAdminCommandHandler
|
|||||||
final int intensity = Integer.parseInt(val1);
|
final int intensity = Integer.parseInt(val1);
|
||||||
final String val2 = st.nextToken();
|
final String val2 = st.nextToken();
|
||||||
final int duration = Integer.parseInt(val2);
|
final int duration = Integer.parseInt(val2);
|
||||||
final Earthquake eq = new Earthquake(activeChar.getX(), activeChar.getY(), activeChar.getZ(), intensity, duration);
|
activeChar.broadcastPacket(new Earthquake(activeChar.getX(), activeChar.getY(), activeChar.getZ(), intensity, duration));
|
||||||
activeChar.broadcastPacket(eq);
|
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
|
|||||||
Vendored
+1
-2
@@ -113,8 +113,7 @@ public class AdminGmChat implements IAdminCommandHandler
|
|||||||
offset = 13;
|
offset = 13;
|
||||||
}
|
}
|
||||||
text = command.substring(offset);
|
text = command.substring(offset);
|
||||||
final CreatureSay cs = new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text);
|
AdminData.getInstance().broadcastToGMs(new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text));
|
||||||
AdminData.getInstance().broadcastToGMs(cs);
|
|
||||||
}
|
}
|
||||||
catch (StringIndexOutOfBoundsException e)
|
catch (StringIndexOutOfBoundsException e)
|
||||||
{
|
{
|
||||||
|
|||||||
Vendored
+1
-4
@@ -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))
|
if (player.isInParty() && player.getParty().isLeader(player) && player.getParty().isInCommandChannel() && player.getParty().getCommandChannel().getLeader().equals(player))
|
||||||
{
|
{
|
||||||
final CommandChannel channel = player.getParty().getCommandChannel();
|
final CommandChannel channel = player.getParty().getCommandChannel();
|
||||||
|
channel.broadcastPacket(new SystemMessage(SystemMessageId.THE_COMMAND_CHANNEL_HAS_BEEN_DISBANDED));
|
||||||
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_COMMAND_CHANNEL_HAS_BEEN_DISBANDED);
|
|
||||||
channel.broadcastPacket(sm);
|
|
||||||
|
|
||||||
channel.disbandChannel();
|
channel.disbandChannel();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
Vendored
-1
@@ -61,7 +61,6 @@ public class ChannelLeave implements IUserCommandHandler
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -667,8 +667,7 @@ public abstract class AbstractAI implements Ctrl
|
|||||||
protected void clientNotifyDead()
|
protected void clientNotifyDead()
|
||||||
{
|
{
|
||||||
// Send a Server->Client packet Die to the actor and all PlayerInstance in its _knownPlayers
|
// Send a Server->Client packet Die to the actor and all PlayerInstance in its _knownPlayers
|
||||||
final Die msg = new Die(_actor);
|
_actor.broadcastPacket(new Die(_actor));
|
||||||
_actor.broadcastPacket(msg);
|
|
||||||
|
|
||||||
// Init AI
|
// Init AI
|
||||||
_intention = AI_INTENTION_IDLE;
|
_intention = AI_INTENTION_IDLE;
|
||||||
|
|||||||
@@ -260,9 +260,9 @@ public class CursedWeapon implements INamable
|
|||||||
_item.setDropTime(0); // Prevent item from being removed by ItemsAutoDestroy
|
_item.setDropTime(0); // Prevent item from being removed by ItemsAutoDestroy
|
||||||
|
|
||||||
// RedSky and Earthquake
|
// 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);
|
final Earthquake eq = new Earthquake(player.getX(), player.getY(), player.getZ(), 14, 3);
|
||||||
Broadcast.toAllOnlinePlayers(packet);
|
Broadcast.toAllOnlinePlayers(rs);
|
||||||
Broadcast.toAllOnlinePlayers(eq);
|
Broadcast.toAllOnlinePlayers(eq);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
+8
-16
@@ -1815,8 +1815,7 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
_lastCompassZone = ExSetCompassZoneCode.ALTEREDZONE;
|
_lastCompassZone = ExSetCompassZoneCode.ALTEREDZONE;
|
||||||
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.ALTEREDZONE);
|
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.ALTEREDZONE));
|
||||||
sendPacket(cz);
|
|
||||||
}
|
}
|
||||||
else if (isInsideZone(ZoneId.SIEGE))
|
else if (isInsideZone(ZoneId.SIEGE))
|
||||||
{
|
{
|
||||||
@@ -1825,8 +1824,7 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
_lastCompassZone = ExSetCompassZoneCode.SIEGEWARZONE2;
|
_lastCompassZone = ExSetCompassZoneCode.SIEGEWARZONE2;
|
||||||
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.SIEGEWARZONE2);
|
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.SIEGEWARZONE2));
|
||||||
sendPacket(cz);
|
|
||||||
}
|
}
|
||||||
else if (isInsideZone(ZoneId.PVP))
|
else if (isInsideZone(ZoneId.PVP))
|
||||||
{
|
{
|
||||||
@@ -1835,8 +1833,7 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
_lastCompassZone = ExSetCompassZoneCode.PVPZONE;
|
_lastCompassZone = ExSetCompassZoneCode.PVPZONE;
|
||||||
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.PVPZONE);
|
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.PVPZONE));
|
||||||
sendPacket(cz);
|
|
||||||
}
|
}
|
||||||
else if (isInsideZone(ZoneId.PEACE))
|
else if (isInsideZone(ZoneId.PEACE))
|
||||||
{
|
{
|
||||||
@@ -1845,8 +1842,7 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
_lastCompassZone = ExSetCompassZoneCode.PEACEZONE;
|
_lastCompassZone = ExSetCompassZoneCode.PEACEZONE;
|
||||||
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.PEACEZONE);
|
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.PEACEZONE));
|
||||||
sendPacket(cz);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -1859,8 +1855,7 @@ public class PlayerInstance extends Playable
|
|||||||
updatePvPStatus();
|
updatePvPStatus();
|
||||||
}
|
}
|
||||||
_lastCompassZone = ExSetCompassZoneCode.GENERALZONE;
|
_lastCompassZone = ExSetCompassZoneCode.GENERALZONE;
|
||||||
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.GENERALZONE);
|
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.GENERALZONE));
|
||||||
sendPacket(cz);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4410,8 +4405,7 @@ public class PlayerInstance extends Playable
|
|||||||
sendPacket(ActionFailed.STATIC_PACKET);
|
sendPacket(ActionFailed.STATIC_PACKET);
|
||||||
|
|
||||||
// Send a Server->Client packet StopMove to this PlayerInstance
|
// Send a Server->Client packet StopMove to this PlayerInstance
|
||||||
final StopMove sm = new StopMove(this);
|
sendPacket(new StopMove(this));
|
||||||
sendPacket(sm);
|
|
||||||
|
|
||||||
SystemMessage smsg = null;
|
SystemMessage smsg = null;
|
||||||
synchronized (target)
|
synchronized (target)
|
||||||
@@ -11790,8 +11784,7 @@ public class PlayerInstance extends Playable
|
|||||||
else if (_canFeed)
|
else if (_canFeed)
|
||||||
{
|
{
|
||||||
setCurrentFeed(getMaxFeed());
|
setCurrentFeed(getMaxFeed());
|
||||||
final SetupGauge sg = new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume());
|
sendPacket(new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()));
|
||||||
sendPacket(sg);
|
|
||||||
if (!isDead())
|
if (!isDead())
|
||||||
{
|
{
|
||||||
_mountFeedTask = ThreadPool.scheduleAtFixedRate(new PetFeedTask(this), 10000, 10000);
|
_mountFeedTask = ThreadPool.scheduleAtFixedRate(new PetFeedTask(this), 10000, 10000);
|
||||||
@@ -11850,8 +11843,7 @@ public class PlayerInstance extends Playable
|
|||||||
{
|
{
|
||||||
final boolean lastHungryState = isHungry();
|
final boolean lastHungryState = isHungry();
|
||||||
_curFeed = num > getMaxFeed() ? getMaxFeed() : num;
|
_curFeed = num > getMaxFeed() ? getMaxFeed() : num;
|
||||||
final SetupGauge sg = new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume());
|
sendPacket(new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()));
|
||||||
sendPacket(sg);
|
|
||||||
// broadcast move speed change when strider becomes hungry / full
|
// broadcast move speed change when strider becomes hungry / full
|
||||||
if (lastHungryState != isHungry())
|
if (lastHungryState != isHungry())
|
||||||
{
|
{
|
||||||
|
|||||||
+2
-4
@@ -246,10 +246,8 @@ public class RaceManagerInstance extends Npc
|
|||||||
if (_state == STARTING_RACE)
|
if (_state == STARTING_RACE)
|
||||||
{
|
{
|
||||||
// state++;
|
// state++;
|
||||||
final PlaySound sRace = new PlaySound(1, "S_Race", 0, 0, 0, 0, 0);
|
broadcast(new PlaySound(1, "S_Race", 0, 0, 0, 0, 0));
|
||||||
broadcast(sRace);
|
broadcast(new PlaySound(0, "ItemSound2.race_start", 1, 121209259, 12125, 182487, -3559));
|
||||||
final PlaySound sRace2 = new PlaySound(0, "ItemSound2.race_start", 1, 121209259, 12125, 182487, -3559);
|
|
||||||
broadcast(sRace2);
|
|
||||||
_packet = new MonRaceInfo(_codes[1][0], _codes[1][1], race.getMonsters(), race.getSpeeds());
|
_packet = new MonRaceInfo(_codes[1][0], _codes[1][1], race.getMonsters(), race.getSpeeds());
|
||||||
sendMonsterInfo();
|
sendMonsterInfo();
|
||||||
|
|
||||||
|
|||||||
+1
-2
@@ -78,8 +78,7 @@ public class CommandChannelMatchingRoom extends MatchingRoom
|
|||||||
p.sendPacket(new ExMPCCRoomMember(player, this));
|
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(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);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
+1
-2
@@ -84,8 +84,7 @@ public class PartyMatchingRoom extends MatchingRoom
|
|||||||
p.sendPacket(SystemMessageId.THE_LEADER_OF_THE_PARTY_ROOM_HAS_CHANGED);
|
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(new SystemMessage(kicked ? SystemMessageId.YOU_HAVE_BEEN_OUSTED_FROM_THE_PARTY_ROOM : SystemMessageId.YOU_HAVE_EXITED_THE_PARTY_ROOM));
|
||||||
player.sendPacket(sm2);
|
|
||||||
player.sendPacket(ExClosePartyRoom.STATIC_PACKET);
|
player.sendPacket(ExClosePartyRoom.STATIC_PACKET);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-2
@@ -194,8 +194,7 @@ public abstract class VoteSystem implements Runnable
|
|||||||
|
|
||||||
private void announce(String msg)
|
private void announce(String msg)
|
||||||
{
|
{
|
||||||
final CreatureSay cs = new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg);
|
Broadcast.toAllOnlinePlayers(new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg));
|
||||||
Broadcast.toAllOnlinePlayers(cs);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public abstract int getVotes();
|
public abstract int getVotes();
|
||||||
|
|||||||
+1
-2
@@ -56,8 +56,7 @@ public class CannotMoveAnymoreInVehicle implements IClientIncomingPacket
|
|||||||
{
|
{
|
||||||
player.setInVehiclePosition(new Location(_x, _y, _z));
|
player.setInVehiclePosition(new Location(_x, _y, _z));
|
||||||
player.setHeading(_heading);
|
player.setHeading(_heading);
|
||||||
final StopMoveInVehicle msg = new StopMoveInVehicle(player, _boatId);
|
player.broadcastPacket(new StopMoveInVehicle(player, _boatId));
|
||||||
player.broadcastPacket(msg);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-2
@@ -107,8 +107,7 @@ public class RequestAnswerFriendInvite implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_ADD_A_FRIEND_TO_YOUR_FRIENDS_LIST);
|
requestor.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_ADD_A_FRIEND_TO_YOUR_FRIENDS_LIST));
|
||||||
requestor.sendPacket(msg);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
player.setActiveRequester(null);
|
player.setActiveRequester(null);
|
||||||
|
|||||||
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/FantasyIsle/HandysBlockCheckerEvent.java
Vendored
+1
-4
@@ -74,10 +74,7 @@ public class HandysBlockCheckerEvent extends AbstractNpcAI
|
|||||||
if (HandysBlockCheckerManager.getInstance().addPlayerToArena(player, arena))
|
if (HandysBlockCheckerManager.getInstance().addPlayerToArena(player, arena))
|
||||||
{
|
{
|
||||||
final ArenaParticipantsHolder holder = HandysBlockCheckerManager.getInstance().getHolder(arena);
|
final ArenaParticipantsHolder holder = HandysBlockCheckerManager.getInstance().getHolder(arena);
|
||||||
|
player.sendPacket(new ExCubeGameTeamList(holder.getRedPlayers(), holder.getBluePlayers(), arena));
|
||||||
final ExCubeGameTeamList tl = new ExCubeGameTeamList(holder.getRedPlayers(), holder.getBluePlayers(), arena);
|
|
||||||
|
|
||||||
player.sendPacket(tl);
|
|
||||||
|
|
||||||
final int countBlue = holder.getBlueTeamSize();
|
final int countBlue = holder.getBlueTeamSize();
|
||||||
final int countRed = holder.getRedTeamSize();
|
final int countRed = holder.getRedTeamSize();
|
||||||
|
|||||||
Vendored
+2
-4
@@ -230,14 +230,12 @@ public class TrainingCamp extends AbstractNpcAI
|
|||||||
{
|
{
|
||||||
if (player.getLevel() <= Config.TRAINING_CAMP_MIN_LEVEL)
|
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(new SystemMessage(SystemMessageId.LV_S1_OR_ABOVE).addInt(Config.TRAINING_CAMP_MIN_LEVEL));
|
||||||
player.sendPacket(sysMsg);
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
else if (player.getLevel() >= Config.TRAINING_CAMP_MAX_LEVEL)
|
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(new SystemMessage(SystemMessageId.LV_S1_OR_BELOW).addInt(Config.TRAINING_CAMP_MAX_LEVEL));
|
||||||
player.sendPacket(sysMsg);
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
else if (player.isFlyingMounted() || player.isTransformed())
|
else if (player.isFlyingMounted() || player.isTransformed())
|
||||||
|
|||||||
Vendored
-1
@@ -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);
|
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());
|
cs.addStringParameter(caster.getName());
|
||||||
|
|
||||||
npc.broadcastPacket(cs);
|
npc.broadcastPacket(cs);
|
||||||
|
|
||||||
caster.addItem("FreyaCelebration", FREYA_GIFT, 1, npc, true);
|
caster.addItem("FreyaCelebration", FREYA_GIFT, 1, npc, true);
|
||||||
|
|||||||
Vendored
+1
-2
@@ -194,8 +194,7 @@ public class AdminEffects implements IAdminCommandHandler
|
|||||||
final int intensity = Integer.parseInt(val1);
|
final int intensity = Integer.parseInt(val1);
|
||||||
final String val2 = st.nextToken();
|
final String val2 = st.nextToken();
|
||||||
final int duration = Integer.parseInt(val2);
|
final int duration = Integer.parseInt(val2);
|
||||||
final Earthquake eq = new Earthquake(activeChar.getX(), activeChar.getY(), activeChar.getZ(), intensity, duration);
|
activeChar.broadcastPacket(new Earthquake(activeChar.getX(), activeChar.getY(), activeChar.getZ(), intensity, duration));
|
||||||
activeChar.broadcastPacket(eq);
|
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
|
|||||||
Vendored
+1
-2
@@ -113,8 +113,7 @@ public class AdminGmChat implements IAdminCommandHandler
|
|||||||
offset = 13;
|
offset = 13;
|
||||||
}
|
}
|
||||||
text = command.substring(offset);
|
text = command.substring(offset);
|
||||||
final CreatureSay cs = new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text);
|
AdminData.getInstance().broadcastToGMs(new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text));
|
||||||
AdminData.getInstance().broadcastToGMs(cs);
|
|
||||||
}
|
}
|
||||||
catch (StringIndexOutOfBoundsException e)
|
catch (StringIndexOutOfBoundsException e)
|
||||||
{
|
{
|
||||||
|
|||||||
Vendored
+1
-4
@@ -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))
|
if (player.isInParty() && player.getParty().isLeader(player) && player.getParty().isInCommandChannel() && player.getParty().getCommandChannel().getLeader().equals(player))
|
||||||
{
|
{
|
||||||
final CommandChannel channel = player.getParty().getCommandChannel();
|
final CommandChannel channel = player.getParty().getCommandChannel();
|
||||||
|
channel.broadcastPacket(new SystemMessage(SystemMessageId.THE_COMMAND_CHANNEL_HAS_BEEN_DISBANDED));
|
||||||
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_COMMAND_CHANNEL_HAS_BEEN_DISBANDED);
|
|
||||||
channel.broadcastPacket(sm);
|
|
||||||
|
|
||||||
channel.disbandChannel();
|
channel.disbandChannel();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
Vendored
-1
@@ -61,7 +61,6 @@ public class ChannelLeave implements IUserCommandHandler
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -667,8 +667,7 @@ public abstract class AbstractAI implements Ctrl
|
|||||||
protected void clientNotifyDead()
|
protected void clientNotifyDead()
|
||||||
{
|
{
|
||||||
// Send a Server->Client packet Die to the actor and all PlayerInstance in its _knownPlayers
|
// Send a Server->Client packet Die to the actor and all PlayerInstance in its _knownPlayers
|
||||||
final Die msg = new Die(_actor);
|
_actor.broadcastPacket(new Die(_actor));
|
||||||
_actor.broadcastPacket(msg);
|
|
||||||
|
|
||||||
// Init AI
|
// Init AI
|
||||||
_intention = AI_INTENTION_IDLE;
|
_intention = AI_INTENTION_IDLE;
|
||||||
|
|||||||
@@ -260,9 +260,9 @@ public class CursedWeapon implements INamable
|
|||||||
_item.setDropTime(0); // Prevent item from being removed by ItemsAutoDestroy
|
_item.setDropTime(0); // Prevent item from being removed by ItemsAutoDestroy
|
||||||
|
|
||||||
// RedSky and Earthquake
|
// 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);
|
final Earthquake eq = new Earthquake(player.getX(), player.getY(), player.getZ(), 14, 3);
|
||||||
Broadcast.toAllOnlinePlayers(packet);
|
Broadcast.toAllOnlinePlayers(rs);
|
||||||
Broadcast.toAllOnlinePlayers(eq);
|
Broadcast.toAllOnlinePlayers(eq);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
+8
-17
@@ -1824,8 +1824,7 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
_lastCompassZone = ExSetCompassZoneCode.ALTEREDZONE;
|
_lastCompassZone = ExSetCompassZoneCode.ALTEREDZONE;
|
||||||
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.ALTEREDZONE);
|
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.ALTEREDZONE));
|
||||||
sendPacket(cz);
|
|
||||||
}
|
}
|
||||||
else if (isInsideZone(ZoneId.SIEGE))
|
else if (isInsideZone(ZoneId.SIEGE))
|
||||||
{
|
{
|
||||||
@@ -1834,8 +1833,7 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
_lastCompassZone = ExSetCompassZoneCode.SIEGEWARZONE2;
|
_lastCompassZone = ExSetCompassZoneCode.SIEGEWARZONE2;
|
||||||
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.SIEGEWARZONE2);
|
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.SIEGEWARZONE2));
|
||||||
sendPacket(cz);
|
|
||||||
}
|
}
|
||||||
else if (isInsideZone(ZoneId.PVP))
|
else if (isInsideZone(ZoneId.PVP))
|
||||||
{
|
{
|
||||||
@@ -1844,8 +1842,7 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
_lastCompassZone = ExSetCompassZoneCode.PVPZONE;
|
_lastCompassZone = ExSetCompassZoneCode.PVPZONE;
|
||||||
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.PVPZONE);
|
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.PVPZONE));
|
||||||
sendPacket(cz);
|
|
||||||
}
|
}
|
||||||
else if (isInsideZone(ZoneId.PEACE))
|
else if (isInsideZone(ZoneId.PEACE))
|
||||||
{
|
{
|
||||||
@@ -1854,8 +1851,7 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
_lastCompassZone = ExSetCompassZoneCode.PEACEZONE;
|
_lastCompassZone = ExSetCompassZoneCode.PEACEZONE;
|
||||||
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.PEACEZONE);
|
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.PEACEZONE));
|
||||||
sendPacket(cz);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -1868,8 +1864,7 @@ public class PlayerInstance extends Playable
|
|||||||
updatePvPStatus();
|
updatePvPStatus();
|
||||||
}
|
}
|
||||||
_lastCompassZone = ExSetCompassZoneCode.GENERALZONE;
|
_lastCompassZone = ExSetCompassZoneCode.GENERALZONE;
|
||||||
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.GENERALZONE);
|
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.GENERALZONE));
|
||||||
sendPacket(cz);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4399,8 +4394,7 @@ public class PlayerInstance extends Playable
|
|||||||
sendPacket(ActionFailed.STATIC_PACKET);
|
sendPacket(ActionFailed.STATIC_PACKET);
|
||||||
|
|
||||||
// Send a Server->Client packet StopMove to this PlayerInstance
|
// Send a Server->Client packet StopMove to this PlayerInstance
|
||||||
final StopMove sm = new StopMove(this);
|
sendPacket(new StopMove(this));
|
||||||
sendPacket(sm);
|
|
||||||
|
|
||||||
SystemMessage smsg = null;
|
SystemMessage smsg = null;
|
||||||
synchronized (target)
|
synchronized (target)
|
||||||
@@ -10457,7 +10451,6 @@ public class PlayerInstance extends Playable
|
|||||||
if (!_snoopListener.isEmpty())
|
if (!_snoopListener.isEmpty())
|
||||||
{
|
{
|
||||||
final Snoop sn = new Snoop(getObjectId(), getName(), type, name, text);
|
final Snoop sn = new Snoop(getObjectId(), getName(), type, name, text);
|
||||||
|
|
||||||
for (PlayerInstance pci : _snoopListener)
|
for (PlayerInstance pci : _snoopListener)
|
||||||
{
|
{
|
||||||
if (pci != null)
|
if (pci != null)
|
||||||
@@ -11758,8 +11751,7 @@ public class PlayerInstance extends Playable
|
|||||||
else if (_canFeed)
|
else if (_canFeed)
|
||||||
{
|
{
|
||||||
setCurrentFeed(getMaxFeed());
|
setCurrentFeed(getMaxFeed());
|
||||||
final SetupGauge sg = new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume());
|
sendPacket(new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()));
|
||||||
sendPacket(sg);
|
|
||||||
if (!isDead())
|
if (!isDead())
|
||||||
{
|
{
|
||||||
_mountFeedTask = ThreadPool.scheduleAtFixedRate(new PetFeedTask(this), 10000, 10000);
|
_mountFeedTask = ThreadPool.scheduleAtFixedRate(new PetFeedTask(this), 10000, 10000);
|
||||||
@@ -11818,8 +11810,7 @@ public class PlayerInstance extends Playable
|
|||||||
{
|
{
|
||||||
final boolean lastHungryState = isHungry();
|
final boolean lastHungryState = isHungry();
|
||||||
_curFeed = num > getMaxFeed() ? getMaxFeed() : num;
|
_curFeed = num > getMaxFeed() ? getMaxFeed() : num;
|
||||||
final SetupGauge sg = new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume());
|
sendPacket(new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()));
|
||||||
sendPacket(sg);
|
|
||||||
// broadcast move speed change when strider becomes hungry / full
|
// broadcast move speed change when strider becomes hungry / full
|
||||||
if (lastHungryState != isHungry())
|
if (lastHungryState != isHungry())
|
||||||
{
|
{
|
||||||
|
|||||||
+2
-4
@@ -246,10 +246,8 @@ public class RaceManagerInstance extends Npc
|
|||||||
if (_state == STARTING_RACE)
|
if (_state == STARTING_RACE)
|
||||||
{
|
{
|
||||||
// state++;
|
// state++;
|
||||||
final PlaySound sRace = new PlaySound(1, "S_Race", 0, 0, 0, 0, 0);
|
broadcast(new PlaySound(1, "S_Race", 0, 0, 0, 0, 0));
|
||||||
broadcast(sRace);
|
broadcast(new PlaySound(0, "ItemSound2.race_start", 1, 121209259, 12125, 182487, -3559));
|
||||||
final PlaySound sRace2 = new PlaySound(0, "ItemSound2.race_start", 1, 121209259, 12125, 182487, -3559);
|
|
||||||
broadcast(sRace2);
|
|
||||||
_packet = new MonRaceInfo(_codes[1][0], _codes[1][1], race.getMonsters(), race.getSpeeds());
|
_packet = new MonRaceInfo(_codes[1][0], _codes[1][1], race.getMonsters(), race.getSpeeds());
|
||||||
sendMonsterInfo();
|
sendMonsterInfo();
|
||||||
|
|
||||||
|
|||||||
+1
-2
@@ -78,8 +78,7 @@ public class CommandChannelMatchingRoom extends MatchingRoom
|
|||||||
p.sendPacket(new ExMPCCRoomMember(player, this));
|
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(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);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
+1
-2
@@ -84,8 +84,7 @@ public class PartyMatchingRoom extends MatchingRoom
|
|||||||
p.sendPacket(SystemMessageId.THE_LEADER_OF_THE_PARTY_ROOM_HAS_CHANGED);
|
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(new SystemMessage(kicked ? SystemMessageId.YOU_HAVE_BEEN_OUSTED_FROM_THE_PARTY_ROOM : SystemMessageId.YOU_HAVE_EXITED_THE_PARTY_ROOM));
|
||||||
player.sendPacket(sm2);
|
|
||||||
player.sendPacket(ExClosePartyRoom.STATIC_PACKET);
|
player.sendPacket(ExClosePartyRoom.STATIC_PACKET);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-2
@@ -194,8 +194,7 @@ public abstract class VoteSystem implements Runnable
|
|||||||
|
|
||||||
private void announce(String msg)
|
private void announce(String msg)
|
||||||
{
|
{
|
||||||
final CreatureSay cs = new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg);
|
Broadcast.toAllOnlinePlayers(new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg));
|
||||||
Broadcast.toAllOnlinePlayers(cs);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public abstract int getVotes();
|
public abstract int getVotes();
|
||||||
|
|||||||
+1
-2
@@ -56,8 +56,7 @@ public class CannotMoveAnymoreInVehicle implements IClientIncomingPacket
|
|||||||
{
|
{
|
||||||
player.setInVehiclePosition(new Location(_x, _y, _z));
|
player.setInVehiclePosition(new Location(_x, _y, _z));
|
||||||
player.setHeading(_heading);
|
player.setHeading(_heading);
|
||||||
final StopMoveInVehicle msg = new StopMoveInVehicle(player, _boatId);
|
player.broadcastPacket(new StopMoveInVehicle(player, _boatId));
|
||||||
player.broadcastPacket(msg);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-2
@@ -67,7 +67,6 @@ public class RequestRecipeBookDestroy implements IClientIncomingPacket
|
|||||||
player.unregisterRecipeList(_recipeID);
|
player.unregisterRecipeList(_recipeID);
|
||||||
|
|
||||||
// Send the new recipe book.
|
// Send the new recipe book.
|
||||||
final RecipeBookItemList response = new RecipeBookItemList(player, rp.isDwarvenRecipe());
|
player.sendPacket(new RecipeBookItemList(player, rp.isDwarvenRecipe()));
|
||||||
player.sendPacket(response);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+1
-2
@@ -61,7 +61,6 @@ public class RequestRecipeBookOpen implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
final RecipeBookItemList response = new RecipeBookItemList(player, _isDwarvenCraft);
|
player.sendPacket(new RecipeBookItemList(player, _isDwarvenCraft));
|
||||||
player.sendPacket(response);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-2
@@ -107,8 +107,7 @@ public class RequestAnswerFriendInvite implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_ADD_A_FRIEND_TO_YOUR_FRIENDS_LIST);
|
requestor.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_ADD_A_FRIEND_TO_YOUR_FRIENDS_LIST));
|
||||||
requestor.sendPacket(msg);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
player.setActiveRequester(null);
|
player.setActiveRequester(null);
|
||||||
|
|||||||
Vendored
+1
-4
@@ -74,10 +74,7 @@ public class HandysBlockCheckerEvent extends AbstractNpcAI
|
|||||||
if (HandysBlockCheckerManager.getInstance().addPlayerToArena(player, arena))
|
if (HandysBlockCheckerManager.getInstance().addPlayerToArena(player, arena))
|
||||||
{
|
{
|
||||||
final ArenaParticipantsHolder holder = HandysBlockCheckerManager.getInstance().getHolder(arena);
|
final ArenaParticipantsHolder holder = HandysBlockCheckerManager.getInstance().getHolder(arena);
|
||||||
|
player.sendPacket(new ExCubeGameTeamList(holder.getRedPlayers(), holder.getBluePlayers(), arena));
|
||||||
final ExCubeGameTeamList tl = new ExCubeGameTeamList(holder.getRedPlayers(), holder.getBluePlayers(), arena);
|
|
||||||
|
|
||||||
player.sendPacket(tl);
|
|
||||||
|
|
||||||
final int countBlue = holder.getBlueTeamSize();
|
final int countBlue = holder.getBlueTeamSize();
|
||||||
final int countRed = holder.getRedTeamSize();
|
final int countRed = holder.getRedTeamSize();
|
||||||
|
|||||||
+2
-4
@@ -230,14 +230,12 @@ public class TrainingCamp extends AbstractNpcAI
|
|||||||
{
|
{
|
||||||
if (player.getLevel() <= Config.TRAINING_CAMP_MIN_LEVEL)
|
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(new SystemMessage(SystemMessageId.LV_S1_OR_ABOVE).addInt(Config.TRAINING_CAMP_MIN_LEVEL));
|
||||||
player.sendPacket(sysMsg);
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
else if (player.getLevel() >= Config.TRAINING_CAMP_MAX_LEVEL)
|
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(new SystemMessage(SystemMessageId.LV_S1_OR_BELOW).addInt(Config.TRAINING_CAMP_MAX_LEVEL));
|
||||||
player.sendPacket(sysMsg);
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
else if (player.isFlyingMounted() || player.isTransformed())
|
else if (player.isFlyingMounted() || player.isTransformed())
|
||||||
|
|||||||
Vendored
-1
@@ -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);
|
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());
|
cs.addStringParameter(caster.getName());
|
||||||
|
|
||||||
npc.broadcastPacket(cs);
|
npc.broadcastPacket(cs);
|
||||||
|
|
||||||
caster.addItem("FreyaCelebration", FREYA_GIFT, 1, npc, true);
|
caster.addItem("FreyaCelebration", FREYA_GIFT, 1, npc, true);
|
||||||
|
|||||||
Vendored
+1
-2
@@ -194,8 +194,7 @@ public class AdminEffects implements IAdminCommandHandler
|
|||||||
final int intensity = Integer.parseInt(val1);
|
final int intensity = Integer.parseInt(val1);
|
||||||
final String val2 = st.nextToken();
|
final String val2 = st.nextToken();
|
||||||
final int duration = Integer.parseInt(val2);
|
final int duration = Integer.parseInt(val2);
|
||||||
final Earthquake eq = new Earthquake(activeChar.getX(), activeChar.getY(), activeChar.getZ(), intensity, duration);
|
activeChar.broadcastPacket(new Earthquake(activeChar.getX(), activeChar.getY(), activeChar.getZ(), intensity, duration));
|
||||||
activeChar.broadcastPacket(eq);
|
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
|
|||||||
Vendored
+1
-2
@@ -113,8 +113,7 @@ public class AdminGmChat implements IAdminCommandHandler
|
|||||||
offset = 13;
|
offset = 13;
|
||||||
}
|
}
|
||||||
text = command.substring(offset);
|
text = command.substring(offset);
|
||||||
final CreatureSay cs = new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text);
|
AdminData.getInstance().broadcastToGMs(new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text));
|
||||||
AdminData.getInstance().broadcastToGMs(cs);
|
|
||||||
}
|
}
|
||||||
catch (StringIndexOutOfBoundsException e)
|
catch (StringIndexOutOfBoundsException e)
|
||||||
{
|
{
|
||||||
|
|||||||
Vendored
+1
-4
@@ -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))
|
if (player.isInParty() && player.getParty().isLeader(player) && player.getParty().isInCommandChannel() && player.getParty().getCommandChannel().getLeader().equals(player))
|
||||||
{
|
{
|
||||||
final CommandChannel channel = player.getParty().getCommandChannel();
|
final CommandChannel channel = player.getParty().getCommandChannel();
|
||||||
|
channel.broadcastPacket(new SystemMessage(SystemMessageId.THE_COMMAND_CHANNEL_HAS_BEEN_DISBANDED));
|
||||||
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_COMMAND_CHANNEL_HAS_BEEN_DISBANDED);
|
|
||||||
channel.broadcastPacket(sm);
|
|
||||||
|
|
||||||
channel.disbandChannel();
|
channel.disbandChannel();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
Vendored
-1
@@ -61,7 +61,6 @@ public class ChannelLeave implements IUserCommandHandler
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -667,8 +667,7 @@ public abstract class AbstractAI implements Ctrl
|
|||||||
protected void clientNotifyDead()
|
protected void clientNotifyDead()
|
||||||
{
|
{
|
||||||
// Send a Server->Client packet Die to the actor and all PlayerInstance in its _knownPlayers
|
// Send a Server->Client packet Die to the actor and all PlayerInstance in its _knownPlayers
|
||||||
final Die msg = new Die(_actor);
|
_actor.broadcastPacket(new Die(_actor));
|
||||||
_actor.broadcastPacket(msg);
|
|
||||||
|
|
||||||
// Init AI
|
// Init AI
|
||||||
_intention = AI_INTENTION_IDLE;
|
_intention = AI_INTENTION_IDLE;
|
||||||
|
|||||||
+1
-2
@@ -41,8 +41,7 @@ public class PcCafePointsManager
|
|||||||
|
|
||||||
if (player.getPcCafePoints() >= Config.PC_CAFE_MAX_POINTS)
|
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(new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_THE_MAXIMUM_NUMBER_OF_PA_POINTS));
|
||||||
player.sendPacket(message);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -260,9 +260,9 @@ public class CursedWeapon implements INamable
|
|||||||
_item.setDropTime(0); // Prevent item from being removed by ItemsAutoDestroy
|
_item.setDropTime(0); // Prevent item from being removed by ItemsAutoDestroy
|
||||||
|
|
||||||
// RedSky and Earthquake
|
// 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);
|
final Earthquake eq = new Earthquake(player.getX(), player.getY(), player.getZ(), 14, 3);
|
||||||
Broadcast.toAllOnlinePlayers(packet);
|
Broadcast.toAllOnlinePlayers(rs);
|
||||||
Broadcast.toAllOnlinePlayers(eq);
|
Broadcast.toAllOnlinePlayers(eq);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
+8
-17
@@ -1817,8 +1817,7 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
_lastCompassZone = ExSetCompassZoneCode.ALTEREDZONE;
|
_lastCompassZone = ExSetCompassZoneCode.ALTEREDZONE;
|
||||||
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.ALTEREDZONE);
|
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.ALTEREDZONE));
|
||||||
sendPacket(cz);
|
|
||||||
}
|
}
|
||||||
else if (isInsideZone(ZoneId.SIEGE))
|
else if (isInsideZone(ZoneId.SIEGE))
|
||||||
{
|
{
|
||||||
@@ -1827,8 +1826,7 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
_lastCompassZone = ExSetCompassZoneCode.SIEGEWARZONE2;
|
_lastCompassZone = ExSetCompassZoneCode.SIEGEWARZONE2;
|
||||||
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.SIEGEWARZONE2);
|
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.SIEGEWARZONE2));
|
||||||
sendPacket(cz);
|
|
||||||
}
|
}
|
||||||
else if (isInsideZone(ZoneId.PVP))
|
else if (isInsideZone(ZoneId.PVP))
|
||||||
{
|
{
|
||||||
@@ -1837,8 +1835,7 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
_lastCompassZone = ExSetCompassZoneCode.PVPZONE;
|
_lastCompassZone = ExSetCompassZoneCode.PVPZONE;
|
||||||
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.PVPZONE);
|
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.PVPZONE));
|
||||||
sendPacket(cz);
|
|
||||||
}
|
}
|
||||||
else if (isInsideZone(ZoneId.PEACE))
|
else if (isInsideZone(ZoneId.PEACE))
|
||||||
{
|
{
|
||||||
@@ -1847,8 +1844,7 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
_lastCompassZone = ExSetCompassZoneCode.PEACEZONE;
|
_lastCompassZone = ExSetCompassZoneCode.PEACEZONE;
|
||||||
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.PEACEZONE);
|
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.PEACEZONE));
|
||||||
sendPacket(cz);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -1861,8 +1857,7 @@ public class PlayerInstance extends Playable
|
|||||||
updatePvPStatus();
|
updatePvPStatus();
|
||||||
}
|
}
|
||||||
_lastCompassZone = ExSetCompassZoneCode.GENERALZONE;
|
_lastCompassZone = ExSetCompassZoneCode.GENERALZONE;
|
||||||
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.GENERALZONE);
|
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.GENERALZONE));
|
||||||
sendPacket(cz);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4377,8 +4372,7 @@ public class PlayerInstance extends Playable
|
|||||||
sendPacket(ActionFailed.STATIC_PACKET);
|
sendPacket(ActionFailed.STATIC_PACKET);
|
||||||
|
|
||||||
// Send a Server->Client packet StopMove to this PlayerInstance
|
// Send a Server->Client packet StopMove to this PlayerInstance
|
||||||
final StopMove sm = new StopMove(this);
|
sendPacket(new StopMove(this));
|
||||||
sendPacket(sm);
|
|
||||||
|
|
||||||
SystemMessage smsg = null;
|
SystemMessage smsg = null;
|
||||||
synchronized (target)
|
synchronized (target)
|
||||||
@@ -10443,7 +10437,6 @@ public class PlayerInstance extends Playable
|
|||||||
if (!_snoopListener.isEmpty())
|
if (!_snoopListener.isEmpty())
|
||||||
{
|
{
|
||||||
final Snoop sn = new Snoop(getObjectId(), getName(), type, name, text);
|
final Snoop sn = new Snoop(getObjectId(), getName(), type, name, text);
|
||||||
|
|
||||||
for (PlayerInstance pci : _snoopListener)
|
for (PlayerInstance pci : _snoopListener)
|
||||||
{
|
{
|
||||||
if (pci != null)
|
if (pci != null)
|
||||||
@@ -11744,8 +11737,7 @@ public class PlayerInstance extends Playable
|
|||||||
else if (_canFeed)
|
else if (_canFeed)
|
||||||
{
|
{
|
||||||
setCurrentFeed(getMaxFeed());
|
setCurrentFeed(getMaxFeed());
|
||||||
final SetupGauge sg = new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume());
|
sendPacket(new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()));
|
||||||
sendPacket(sg);
|
|
||||||
if (!isDead())
|
if (!isDead())
|
||||||
{
|
{
|
||||||
_mountFeedTask = ThreadPool.scheduleAtFixedRate(new PetFeedTask(this), 10000, 10000);
|
_mountFeedTask = ThreadPool.scheduleAtFixedRate(new PetFeedTask(this), 10000, 10000);
|
||||||
@@ -11804,8 +11796,7 @@ public class PlayerInstance extends Playable
|
|||||||
{
|
{
|
||||||
final boolean lastHungryState = isHungry();
|
final boolean lastHungryState = isHungry();
|
||||||
_curFeed = num > getMaxFeed() ? getMaxFeed() : num;
|
_curFeed = num > getMaxFeed() ? getMaxFeed() : num;
|
||||||
final SetupGauge sg = new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume());
|
sendPacket(new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()));
|
||||||
sendPacket(sg);
|
|
||||||
// broadcast move speed change when strider becomes hungry / full
|
// broadcast move speed change when strider becomes hungry / full
|
||||||
if (lastHungryState != isHungry())
|
if (lastHungryState != isHungry())
|
||||||
{
|
{
|
||||||
|
|||||||
+2
-4
@@ -246,10 +246,8 @@ public class RaceManagerInstance extends Npc
|
|||||||
if (_state == STARTING_RACE)
|
if (_state == STARTING_RACE)
|
||||||
{
|
{
|
||||||
// state++;
|
// state++;
|
||||||
final PlaySound sRace = new PlaySound(1, "S_Race", 0, 0, 0, 0, 0);
|
broadcast(new PlaySound(1, "S_Race", 0, 0, 0, 0, 0));
|
||||||
broadcast(sRace);
|
broadcast(new PlaySound(0, "ItemSound2.race_start", 1, 121209259, 12125, 182487, -3559));
|
||||||
final PlaySound sRace2 = new PlaySound(0, "ItemSound2.race_start", 1, 121209259, 12125, 182487, -3559);
|
|
||||||
broadcast(sRace2);
|
|
||||||
_packet = new MonRaceInfo(_codes[1][0], _codes[1][1], race.getMonsters(), race.getSpeeds());
|
_packet = new MonRaceInfo(_codes[1][0], _codes[1][1], race.getMonsters(), race.getSpeeds());
|
||||||
sendMonsterInfo();
|
sendMonsterInfo();
|
||||||
|
|
||||||
|
|||||||
+1
-2
@@ -78,8 +78,7 @@ public class CommandChannelMatchingRoom extends MatchingRoom
|
|||||||
p.sendPacket(new ExMPCCRoomMember(player, this));
|
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(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);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
+1
-2
@@ -84,8 +84,7 @@ public class PartyMatchingRoom extends MatchingRoom
|
|||||||
p.sendPacket(SystemMessageId.THE_LEADER_OF_THE_PARTY_ROOM_HAS_CHANGED);
|
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(new SystemMessage(kicked ? SystemMessageId.YOU_HAVE_BEEN_OUSTED_FROM_THE_PARTY_ROOM : SystemMessageId.YOU_HAVE_EXITED_THE_PARTY_ROOM));
|
||||||
player.sendPacket(sm2);
|
|
||||||
player.sendPacket(ExClosePartyRoom.STATIC_PACKET);
|
player.sendPacket(ExClosePartyRoom.STATIC_PACKET);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-2
@@ -194,8 +194,7 @@ public abstract class VoteSystem implements Runnable
|
|||||||
|
|
||||||
private void announce(String msg)
|
private void announce(String msg)
|
||||||
{
|
{
|
||||||
final CreatureSay cs = new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg);
|
Broadcast.toAllOnlinePlayers(new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg));
|
||||||
Broadcast.toAllOnlinePlayers(cs);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public abstract int getVotes();
|
public abstract int getVotes();
|
||||||
|
|||||||
+1
-2
@@ -56,8 +56,7 @@ public class CannotMoveAnymoreInVehicle implements IClientIncomingPacket
|
|||||||
{
|
{
|
||||||
player.setInVehiclePosition(new Location(_x, _y, _z));
|
player.setInVehiclePosition(new Location(_x, _y, _z));
|
||||||
player.setHeading(_heading);
|
player.setHeading(_heading);
|
||||||
final StopMoveInVehicle msg = new StopMoveInVehicle(player, _boatId);
|
player.broadcastPacket(new StopMoveInVehicle(player, _boatId));
|
||||||
player.broadcastPacket(msg);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-2
@@ -67,7 +67,6 @@ public class RequestRecipeBookDestroy implements IClientIncomingPacket
|
|||||||
player.unregisterRecipeList(_recipeID);
|
player.unregisterRecipeList(_recipeID);
|
||||||
|
|
||||||
// Send the new recipe book.
|
// Send the new recipe book.
|
||||||
final RecipeBookItemList response = new RecipeBookItemList(player, rp.isDwarvenRecipe());
|
player.sendPacket(new RecipeBookItemList(player, rp.isDwarvenRecipe()));
|
||||||
player.sendPacket(response);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+1
-2
@@ -61,7 +61,6 @@ public class RequestRecipeBookOpen implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
final RecipeBookItemList response = new RecipeBookItemList(player, _isDwarvenCraft);
|
player.sendPacket(new RecipeBookItemList(player, _isDwarvenCraft));
|
||||||
player.sendPacket(response);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-2
@@ -107,8 +107,7 @@ public class RequestAnswerFriendInvite implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_ADD_A_FRIEND_TO_YOUR_FRIENDS_LIST);
|
requestor.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_ADD_A_FRIEND_TO_YOUR_FRIENDS_LIST));
|
||||||
requestor.sendPacket(msg);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
player.setActiveRequester(null);
|
player.setActiveRequester(null);
|
||||||
|
|||||||
Vendored
+1
-4
@@ -74,10 +74,7 @@ public class HandysBlockCheckerEvent extends AbstractNpcAI
|
|||||||
if (HandysBlockCheckerManager.getInstance().addPlayerToArena(player, arena))
|
if (HandysBlockCheckerManager.getInstance().addPlayerToArena(player, arena))
|
||||||
{
|
{
|
||||||
final ArenaParticipantsHolder holder = HandysBlockCheckerManager.getInstance().getHolder(arena);
|
final ArenaParticipantsHolder holder = HandysBlockCheckerManager.getInstance().getHolder(arena);
|
||||||
|
player.sendPacket(new ExCubeGameTeamList(holder.getRedPlayers(), holder.getBluePlayers(), arena));
|
||||||
final ExCubeGameTeamList tl = new ExCubeGameTeamList(holder.getRedPlayers(), holder.getBluePlayers(), arena);
|
|
||||||
|
|
||||||
player.sendPacket(tl);
|
|
||||||
|
|
||||||
final int countBlue = holder.getBlueTeamSize();
|
final int countBlue = holder.getBlueTeamSize();
|
||||||
final int countRed = holder.getRedTeamSize();
|
final int countRed = holder.getRedTeamSize();
|
||||||
|
|||||||
+2
-4
@@ -230,14 +230,12 @@ public class TrainingCamp extends AbstractNpcAI
|
|||||||
{
|
{
|
||||||
if (player.getLevel() <= Config.TRAINING_CAMP_MIN_LEVEL)
|
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(new SystemMessage(SystemMessageId.LV_S1_OR_ABOVE).addInt(Config.TRAINING_CAMP_MIN_LEVEL));
|
||||||
player.sendPacket(sysMsg);
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
else if (player.getLevel() >= Config.TRAINING_CAMP_MAX_LEVEL)
|
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(new SystemMessage(SystemMessageId.LV_S1_OR_BELOW).addInt(Config.TRAINING_CAMP_MAX_LEVEL));
|
||||||
player.sendPacket(sysMsg);
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
else if (player.isFlyingMounted() || player.isTransformed())
|
else if (player.isFlyingMounted() || player.isTransformed())
|
||||||
|
|||||||
Vendored
-1
@@ -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);
|
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());
|
cs.addStringParameter(caster.getName());
|
||||||
|
|
||||||
npc.broadcastPacket(cs);
|
npc.broadcastPacket(cs);
|
||||||
|
|
||||||
caster.addItem("FreyaCelebration", FREYA_GIFT, 1, npc, true);
|
caster.addItem("FreyaCelebration", FREYA_GIFT, 1, npc, true);
|
||||||
|
|||||||
Vendored
+1
-2
@@ -194,8 +194,7 @@ public class AdminEffects implements IAdminCommandHandler
|
|||||||
final int intensity = Integer.parseInt(val1);
|
final int intensity = Integer.parseInt(val1);
|
||||||
final String val2 = st.nextToken();
|
final String val2 = st.nextToken();
|
||||||
final int duration = Integer.parseInt(val2);
|
final int duration = Integer.parseInt(val2);
|
||||||
final Earthquake eq = new Earthquake(activeChar.getX(), activeChar.getY(), activeChar.getZ(), intensity, duration);
|
activeChar.broadcastPacket(new Earthquake(activeChar.getX(), activeChar.getY(), activeChar.getZ(), intensity, duration));
|
||||||
activeChar.broadcastPacket(eq);
|
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
|
|||||||
Vendored
+1
-2
@@ -113,8 +113,7 @@ public class AdminGmChat implements IAdminCommandHandler
|
|||||||
offset = 13;
|
offset = 13;
|
||||||
}
|
}
|
||||||
text = command.substring(offset);
|
text = command.substring(offset);
|
||||||
final CreatureSay cs = new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text);
|
AdminData.getInstance().broadcastToGMs(new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text));
|
||||||
AdminData.getInstance().broadcastToGMs(cs);
|
|
||||||
}
|
}
|
||||||
catch (StringIndexOutOfBoundsException e)
|
catch (StringIndexOutOfBoundsException e)
|
||||||
{
|
{
|
||||||
|
|||||||
Vendored
+1
-4
@@ -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))
|
if (player.isInParty() && player.getParty().isLeader(player) && player.getParty().isInCommandChannel() && player.getParty().getCommandChannel().getLeader().equals(player))
|
||||||
{
|
{
|
||||||
final CommandChannel channel = player.getParty().getCommandChannel();
|
final CommandChannel channel = player.getParty().getCommandChannel();
|
||||||
|
channel.broadcastPacket(new SystemMessage(SystemMessageId.THE_COMMAND_CHANNEL_HAS_BEEN_DISBANDED));
|
||||||
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_COMMAND_CHANNEL_HAS_BEEN_DISBANDED);
|
|
||||||
channel.broadcastPacket(sm);
|
|
||||||
|
|
||||||
channel.disbandChannel();
|
channel.disbandChannel();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
Vendored
-1
@@ -61,7 +61,6 @@ public class ChannelLeave implements IUserCommandHandler
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -667,8 +667,7 @@ public abstract class AbstractAI implements Ctrl
|
|||||||
protected void clientNotifyDead()
|
protected void clientNotifyDead()
|
||||||
{
|
{
|
||||||
// Send a Server->Client packet Die to the actor and all PlayerInstance in its _knownPlayers
|
// Send a Server->Client packet Die to the actor and all PlayerInstance in its _knownPlayers
|
||||||
final Die msg = new Die(_actor);
|
_actor.broadcastPacket(new Die(_actor));
|
||||||
_actor.broadcastPacket(msg);
|
|
||||||
|
|
||||||
// Init AI
|
// Init AI
|
||||||
_intention = AI_INTENTION_IDLE;
|
_intention = AI_INTENTION_IDLE;
|
||||||
|
|||||||
+1
-2
@@ -41,8 +41,7 @@ public class PcCafePointsManager
|
|||||||
|
|
||||||
if (player.getPcCafePoints() >= Config.PC_CAFE_MAX_POINTS)
|
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(new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_THE_MAXIMUM_NUMBER_OF_PA_POINTS));
|
||||||
player.sendPacket(message);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -260,9 +260,9 @@ public class CursedWeapon implements INamable
|
|||||||
_item.setDropTime(0); // Prevent item from being removed by ItemsAutoDestroy
|
_item.setDropTime(0); // Prevent item from being removed by ItemsAutoDestroy
|
||||||
|
|
||||||
// RedSky and Earthquake
|
// 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);
|
final Earthquake eq = new Earthquake(player.getX(), player.getY(), player.getZ(), 14, 3);
|
||||||
Broadcast.toAllOnlinePlayers(packet);
|
Broadcast.toAllOnlinePlayers(rs);
|
||||||
Broadcast.toAllOnlinePlayers(eq);
|
Broadcast.toAllOnlinePlayers(eq);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
+8
-17
@@ -1817,8 +1817,7 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
_lastCompassZone = ExSetCompassZoneCode.ALTEREDZONE;
|
_lastCompassZone = ExSetCompassZoneCode.ALTEREDZONE;
|
||||||
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.ALTEREDZONE);
|
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.ALTEREDZONE));
|
||||||
sendPacket(cz);
|
|
||||||
}
|
}
|
||||||
else if (isInsideZone(ZoneId.SIEGE))
|
else if (isInsideZone(ZoneId.SIEGE))
|
||||||
{
|
{
|
||||||
@@ -1827,8 +1826,7 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
_lastCompassZone = ExSetCompassZoneCode.SIEGEWARZONE2;
|
_lastCompassZone = ExSetCompassZoneCode.SIEGEWARZONE2;
|
||||||
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.SIEGEWARZONE2);
|
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.SIEGEWARZONE2));
|
||||||
sendPacket(cz);
|
|
||||||
}
|
}
|
||||||
else if (isInsideZone(ZoneId.PVP))
|
else if (isInsideZone(ZoneId.PVP))
|
||||||
{
|
{
|
||||||
@@ -1837,8 +1835,7 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
_lastCompassZone = ExSetCompassZoneCode.PVPZONE;
|
_lastCompassZone = ExSetCompassZoneCode.PVPZONE;
|
||||||
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.PVPZONE);
|
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.PVPZONE));
|
||||||
sendPacket(cz);
|
|
||||||
}
|
}
|
||||||
else if (isInsideZone(ZoneId.PEACE))
|
else if (isInsideZone(ZoneId.PEACE))
|
||||||
{
|
{
|
||||||
@@ -1847,8 +1844,7 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
_lastCompassZone = ExSetCompassZoneCode.PEACEZONE;
|
_lastCompassZone = ExSetCompassZoneCode.PEACEZONE;
|
||||||
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.PEACEZONE);
|
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.PEACEZONE));
|
||||||
sendPacket(cz);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -1861,8 +1857,7 @@ public class PlayerInstance extends Playable
|
|||||||
updatePvPStatus();
|
updatePvPStatus();
|
||||||
}
|
}
|
||||||
_lastCompassZone = ExSetCompassZoneCode.GENERALZONE;
|
_lastCompassZone = ExSetCompassZoneCode.GENERALZONE;
|
||||||
final ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.GENERALZONE);
|
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.GENERALZONE));
|
||||||
sendPacket(cz);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4377,8 +4372,7 @@ public class PlayerInstance extends Playable
|
|||||||
sendPacket(ActionFailed.STATIC_PACKET);
|
sendPacket(ActionFailed.STATIC_PACKET);
|
||||||
|
|
||||||
// Send a Server->Client packet StopMove to this PlayerInstance
|
// Send a Server->Client packet StopMove to this PlayerInstance
|
||||||
final StopMove sm = new StopMove(this);
|
sendPacket(new StopMove(this));
|
||||||
sendPacket(sm);
|
|
||||||
|
|
||||||
SystemMessage smsg = null;
|
SystemMessage smsg = null;
|
||||||
synchronized (target)
|
synchronized (target)
|
||||||
@@ -10446,7 +10440,6 @@ public class PlayerInstance extends Playable
|
|||||||
if (!_snoopListener.isEmpty())
|
if (!_snoopListener.isEmpty())
|
||||||
{
|
{
|
||||||
final Snoop sn = new Snoop(getObjectId(), getName(), type, name, text);
|
final Snoop sn = new Snoop(getObjectId(), getName(), type, name, text);
|
||||||
|
|
||||||
for (PlayerInstance pci : _snoopListener)
|
for (PlayerInstance pci : _snoopListener)
|
||||||
{
|
{
|
||||||
if (pci != null)
|
if (pci != null)
|
||||||
@@ -11747,8 +11740,7 @@ public class PlayerInstance extends Playable
|
|||||||
else if (_canFeed)
|
else if (_canFeed)
|
||||||
{
|
{
|
||||||
setCurrentFeed(getMaxFeed());
|
setCurrentFeed(getMaxFeed());
|
||||||
final SetupGauge sg = new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume());
|
sendPacket(new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()));
|
||||||
sendPacket(sg);
|
|
||||||
if (!isDead())
|
if (!isDead())
|
||||||
{
|
{
|
||||||
_mountFeedTask = ThreadPool.scheduleAtFixedRate(new PetFeedTask(this), 10000, 10000);
|
_mountFeedTask = ThreadPool.scheduleAtFixedRate(new PetFeedTask(this), 10000, 10000);
|
||||||
@@ -11807,8 +11799,7 @@ public class PlayerInstance extends Playable
|
|||||||
{
|
{
|
||||||
final boolean lastHungryState = isHungry();
|
final boolean lastHungryState = isHungry();
|
||||||
_curFeed = num > getMaxFeed() ? getMaxFeed() : num;
|
_curFeed = num > getMaxFeed() ? getMaxFeed() : num;
|
||||||
final SetupGauge sg = new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume());
|
sendPacket(new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()));
|
||||||
sendPacket(sg);
|
|
||||||
// broadcast move speed change when strider becomes hungry / full
|
// broadcast move speed change when strider becomes hungry / full
|
||||||
if (lastHungryState != isHungry())
|
if (lastHungryState != isHungry())
|
||||||
{
|
{
|
||||||
|
|||||||
+2
-4
@@ -246,10 +246,8 @@ public class RaceManagerInstance extends Npc
|
|||||||
if (_state == STARTING_RACE)
|
if (_state == STARTING_RACE)
|
||||||
{
|
{
|
||||||
// state++;
|
// state++;
|
||||||
final PlaySound sRace = new PlaySound(1, "S_Race", 0, 0, 0, 0, 0);
|
broadcast(new PlaySound(1, "S_Race", 0, 0, 0, 0, 0));
|
||||||
broadcast(sRace);
|
broadcast(new PlaySound(0, "ItemSound2.race_start", 1, 121209259, 12125, 182487, -3559));
|
||||||
final PlaySound sRace2 = new PlaySound(0, "ItemSound2.race_start", 1, 121209259, 12125, 182487, -3559);
|
|
||||||
broadcast(sRace2);
|
|
||||||
_packet = new MonRaceInfo(_codes[1][0], _codes[1][1], race.getMonsters(), race.getSpeeds());
|
_packet = new MonRaceInfo(_codes[1][0], _codes[1][1], race.getMonsters(), race.getSpeeds());
|
||||||
sendMonsterInfo();
|
sendMonsterInfo();
|
||||||
|
|
||||||
|
|||||||
+1
-2
@@ -78,8 +78,7 @@ public class CommandChannelMatchingRoom extends MatchingRoom
|
|||||||
p.sendPacket(new ExMPCCRoomMember(player, this));
|
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(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);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
+1
-2
@@ -84,8 +84,7 @@ public class PartyMatchingRoom extends MatchingRoom
|
|||||||
p.sendPacket(SystemMessageId.THE_LEADER_OF_THE_PARTY_ROOM_HAS_CHANGED);
|
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(new SystemMessage(kicked ? SystemMessageId.YOU_HAVE_BEEN_OUSTED_FROM_THE_PARTY_ROOM : SystemMessageId.YOU_HAVE_EXITED_THE_PARTY_ROOM));
|
||||||
player.sendPacket(sm2);
|
|
||||||
player.sendPacket(ExClosePartyRoom.STATIC_PACKET);
|
player.sendPacket(ExClosePartyRoom.STATIC_PACKET);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-2
@@ -194,8 +194,7 @@ public abstract class VoteSystem implements Runnable
|
|||||||
|
|
||||||
private void announce(String msg)
|
private void announce(String msg)
|
||||||
{
|
{
|
||||||
final CreatureSay cs = new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg);
|
Broadcast.toAllOnlinePlayers(new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg));
|
||||||
Broadcast.toAllOnlinePlayers(cs);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public abstract int getVotes();
|
public abstract int getVotes();
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user