summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-06-03 03:18:30 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-06-03 03:18:30 +0000
commit2338a3bab2b1f22a1e298abf280ecf2a1534f743 (patch)
treefc9bf1849abf8bd54fd602cde46456d3eca71057 /src/map
parentce5da5fcc9ed2ce984eaf2aa1a9e0cfaba460bdb (diff)
downloadhercules-2338a3bab2b1f22a1e298abf280ecf2a1534f743.tar.gz
hercules-2338a3bab2b1f22a1e298abf280ecf2a1534f743.tar.bz2
hercules-2338a3bab2b1f22a1e298abf280ecf2a1534f743.tar.xz
hercules-2338a3bab2b1f22a1e298abf280ecf2a1534f743.zip
* Fixed a crash in clif_parse_FriendsListAdd, when a player is added that is not online (bugreport:4947, since r14835).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14843 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/clif.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 3d6f9f5af..afa8f79fd 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -11989,17 +11989,17 @@ void clif_parse_FriendsListAdd(int fd, struct map_session_data *sd)
f_sd = map_nick2sd((char*)RFIFOP(fd,2));
- if( sd->bl.id == f_sd->bl.id )
- {// adding oneself as friend
- return;
- }
-
// Friend doesn't exist (no player with this name)
if (f_sd == NULL) {
clif_displaymessage(fd, msg_txt(3));
return;
}
+ if( sd->bl.id == f_sd->bl.id )
+ {// adding oneself as friend
+ return;
+ }
+
// @noask [LuzZza]
if(f_sd->state.noask) {
clif_noask_sub(sd, f_sd, 5);