Fixed wrong parameter count in system message.
Contributed by Sahar.
This commit is contained in:
parent
6b55bfa924
commit
26edc62921
@ -124,9 +124,7 @@ public class RequestFriendInvite implements IClientIncomingPacket
|
|||||||
// Target already in friend list.
|
// Target already in friend list.
|
||||||
if (player.getFriendList().contains(friend.getObjectId()))
|
if (player.getFriendList().contains(friend.getObjectId()))
|
||||||
{
|
{
|
||||||
sm = new SystemMessage(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST);
|
player.sendPacket(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST);
|
||||||
sm.addString(_name);
|
|
||||||
player.sendPacket(sm);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// Target is busy.
|
// Target is busy.
|
||||||
|
@ -124,9 +124,7 @@ public class RequestFriendInvite implements IClientIncomingPacket
|
|||||||
// Target already in friend list.
|
// Target already in friend list.
|
||||||
if (player.getFriendList().contains(friend.getObjectId()))
|
if (player.getFriendList().contains(friend.getObjectId()))
|
||||||
{
|
{
|
||||||
sm = new SystemMessage(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST);
|
player.sendPacket(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST);
|
||||||
sm.addString(_name);
|
|
||||||
player.sendPacket(sm);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// Target is busy.
|
// Target is busy.
|
||||||
|
@ -124,9 +124,7 @@ public class RequestFriendInvite implements IClientIncomingPacket
|
|||||||
// Target already in friend list.
|
// Target already in friend list.
|
||||||
if (player.getFriendList().contains(friend.getObjectId()))
|
if (player.getFriendList().contains(friend.getObjectId()))
|
||||||
{
|
{
|
||||||
sm = new SystemMessage(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST);
|
player.sendPacket(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST);
|
||||||
sm.addString(_name);
|
|
||||||
player.sendPacket(sm);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// Target is busy.
|
// Target is busy.
|
||||||
|
@ -124,9 +124,7 @@ public class RequestFriendInvite implements IClientIncomingPacket
|
|||||||
// Target already in friend list.
|
// Target already in friend list.
|
||||||
if (player.getFriendList().contains(friend.getObjectId()))
|
if (player.getFriendList().contains(friend.getObjectId()))
|
||||||
{
|
{
|
||||||
sm = new SystemMessage(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST);
|
player.sendPacket(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST);
|
||||||
sm.addString(_name);
|
|
||||||
player.sendPacket(sm);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// Target is busy.
|
// Target is busy.
|
||||||
|
@ -124,9 +124,7 @@ public class RequestFriendInvite implements IClientIncomingPacket
|
|||||||
// Target already in friend list.
|
// Target already in friend list.
|
||||||
if (player.getFriendList().contains(friend.getObjectId()))
|
if (player.getFriendList().contains(friend.getObjectId()))
|
||||||
{
|
{
|
||||||
sm = new SystemMessage(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST);
|
player.sendPacket(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST);
|
||||||
sm.addString(_name);
|
|
||||||
player.sendPacket(sm);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// Target is busy.
|
// Target is busy.
|
||||||
|
@ -124,9 +124,7 @@ public class RequestFriendInvite implements IClientIncomingPacket
|
|||||||
// Target already in friend list.
|
// Target already in friend list.
|
||||||
if (player.getFriendList().contains(friend.getObjectId()))
|
if (player.getFriendList().contains(friend.getObjectId()))
|
||||||
{
|
{
|
||||||
sm = new SystemMessage(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST);
|
player.sendPacket(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST);
|
||||||
sm.addString(_name);
|
|
||||||
player.sendPacket(sm);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// Target is busy.
|
// Target is busy.
|
||||||
|
@ -124,9 +124,7 @@ public class RequestFriendInvite implements IClientIncomingPacket
|
|||||||
// Target already in friend list.
|
// Target already in friend list.
|
||||||
if (player.getFriendList().contains(friend.getObjectId()))
|
if (player.getFriendList().contains(friend.getObjectId()))
|
||||||
{
|
{
|
||||||
sm = new SystemMessage(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST);
|
player.sendPacket(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST);
|
||||||
sm.addString(_name);
|
|
||||||
player.sendPacket(sm);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// Target is busy.
|
// Target is busy.
|
||||||
|
@ -124,9 +124,7 @@ public class RequestFriendInvite implements IClientIncomingPacket
|
|||||||
// Target already in friend list.
|
// Target already in friend list.
|
||||||
if (player.getFriendList().contains(friend.getObjectId()))
|
if (player.getFriendList().contains(friend.getObjectId()))
|
||||||
{
|
{
|
||||||
sm = new SystemMessage(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST);
|
player.sendPacket(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST);
|
||||||
sm.addString(_name);
|
|
||||||
player.sendPacket(sm);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// Target is busy.
|
// Target is busy.
|
||||||
|
@ -57,9 +57,7 @@ public class RequestAnswerFriendInvite implements IClientIncomingPacket
|
|||||||
if (player.getFriendList().contains(requestor.getObjectId()) //
|
if (player.getFriendList().contains(requestor.getObjectId()) //
|
||||||
|| requestor.getFriendList().contains(player.getObjectId()))
|
|| requestor.getFriendList().contains(player.getObjectId()))
|
||||||
{
|
{
|
||||||
final SystemMessage sm = new SystemMessage(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST);
|
requestor.sendPacket(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST);
|
||||||
sm.addString(player.getName());
|
|
||||||
requestor.sendPacket(sm);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -83,9 +83,7 @@ public class RequestFriendInvite implements IClientIncomingPacket
|
|||||||
// Target already in friend list.
|
// Target already in friend list.
|
||||||
if (player.getFriendList().contains(friend.getObjectId()))
|
if (player.getFriendList().contains(friend.getObjectId()))
|
||||||
{
|
{
|
||||||
sm = new SystemMessage(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST);
|
player.sendPacket(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST);
|
||||||
sm.addString(_name);
|
|
||||||
player.sendPacket(sm);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// Target is busy.
|
// Target is busy.
|
||||||
|
@ -57,9 +57,7 @@ public class RequestAnswerFriendInvite implements IClientIncomingPacket
|
|||||||
if (player.getFriendList().contains(requestor.getObjectId()) //
|
if (player.getFriendList().contains(requestor.getObjectId()) //
|
||||||
|| requestor.getFriendList().contains(player.getObjectId()))
|
|| requestor.getFriendList().contains(player.getObjectId()))
|
||||||
{
|
{
|
||||||
final SystemMessage sm = new SystemMessage(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST);
|
requestor.sendPacket(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST);
|
||||||
sm.addString(player.getName());
|
|
||||||
requestor.sendPacket(sm);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -83,9 +83,7 @@ public class RequestFriendInvite implements IClientIncomingPacket
|
|||||||
// Target already in friend list.
|
// Target already in friend list.
|
||||||
if (player.getFriendList().contains(friend.getObjectId()))
|
if (player.getFriendList().contains(friend.getObjectId()))
|
||||||
{
|
{
|
||||||
sm = new SystemMessage(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST);
|
player.sendPacket(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST);
|
||||||
sm.addString(_name);
|
|
||||||
player.sendPacket(sm);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// Target is busy.
|
// Target is busy.
|
||||||
|
@ -124,9 +124,7 @@ public class RequestFriendInvite implements IClientIncomingPacket
|
|||||||
// Target already in friend list.
|
// Target already in friend list.
|
||||||
if (player.getFriendList().contains(friend.getObjectId()))
|
if (player.getFriendList().contains(friend.getObjectId()))
|
||||||
{
|
{
|
||||||
sm = new SystemMessage(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST);
|
player.sendPacket(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST);
|
||||||
sm.addString(_name);
|
|
||||||
player.sendPacket(sm);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// Target is busy.
|
// Target is busy.
|
||||||
|
@ -124,9 +124,7 @@ public class RequestFriendInvite implements IClientIncomingPacket
|
|||||||
// Target already in friend list.
|
// Target already in friend list.
|
||||||
if (player.getFriendList().contains(friend.getObjectId()))
|
if (player.getFriendList().contains(friend.getObjectId()))
|
||||||
{
|
{
|
||||||
sm = new SystemMessage(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST);
|
player.sendPacket(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST);
|
||||||
sm.addString(_name);
|
|
||||||
player.sendPacket(sm);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// Target is busy.
|
// Target is busy.
|
||||||
|
@ -124,9 +124,7 @@ public class RequestFriendInvite implements IClientIncomingPacket
|
|||||||
// Target already in friend list.
|
// Target already in friend list.
|
||||||
if (player.getFriendList().contains(friend.getObjectId()))
|
if (player.getFriendList().contains(friend.getObjectId()))
|
||||||
{
|
{
|
||||||
sm = new SystemMessage(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST);
|
player.sendPacket(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST);
|
||||||
sm.addString(_name);
|
|
||||||
player.sendPacket(sm);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// Target is busy.
|
// Target is busy.
|
||||||
|
@ -124,9 +124,7 @@ public class RequestFriendInvite implements IClientIncomingPacket
|
|||||||
// Target already in friend list.
|
// Target already in friend list.
|
||||||
if (player.getFriendList().contains(friend.getObjectId()))
|
if (player.getFriendList().contains(friend.getObjectId()))
|
||||||
{
|
{
|
||||||
sm = new SystemMessage(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST);
|
player.sendPacket(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST);
|
||||||
sm.addString(_name);
|
|
||||||
player.sendPacket(sm);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// Target is busy.
|
// Target is busy.
|
||||||
|
@ -124,9 +124,7 @@ public class RequestFriendInvite implements IClientIncomingPacket
|
|||||||
// Target already in friend list.
|
// Target already in friend list.
|
||||||
if (player.getFriendList().contains(friend.getObjectId()))
|
if (player.getFriendList().contains(friend.getObjectId()))
|
||||||
{
|
{
|
||||||
sm = new SystemMessage(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST);
|
player.sendPacket(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST);
|
||||||
sm.addString(_name);
|
|
||||||
player.sendPacket(sm);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// Target is busy.
|
// Target is busy.
|
||||||
|
@ -124,9 +124,7 @@ public class RequestFriendInvite implements IClientIncomingPacket
|
|||||||
// Target already in friend list.
|
// Target already in friend list.
|
||||||
if (player.getFriendList().contains(friend.getObjectId()))
|
if (player.getFriendList().contains(friend.getObjectId()))
|
||||||
{
|
{
|
||||||
sm = new SystemMessage(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST);
|
player.sendPacket(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST);
|
||||||
sm.addString(_name);
|
|
||||||
player.sendPacket(sm);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// Target is busy.
|
// Target is busy.
|
||||||
|
@ -124,9 +124,7 @@ public class RequestFriendInvite implements IClientIncomingPacket
|
|||||||
// Target already in friend list.
|
// Target already in friend list.
|
||||||
if (player.getFriendList().contains(friend.getObjectId()))
|
if (player.getFriendList().contains(friend.getObjectId()))
|
||||||
{
|
{
|
||||||
sm = new SystemMessage(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST);
|
player.sendPacket(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST);
|
||||||
sm.addString(_name);
|
|
||||||
player.sendPacket(sm);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// Target is busy.
|
// Target is busy.
|
||||||
|
Loading…
Reference in New Issue
Block a user