summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-07-10 00:37:07 +0000
committerFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-07-10 00:37:07 +0000
commitdfd9bcd2b9a77ff69d10add1f3b82566b1c87abe (patch)
tree48026bce142e6309125d7fe571fc5f6042138f5d
parent98b4c083aabe025b67022367f24a7543f33fcfc5 (diff)
downloadhercules-dfd9bcd2b9a77ff69d10add1f3b82566b1c87abe.tar.gz
hercules-dfd9bcd2b9a77ff69d10add1f3b82566b1c87abe.tar.bz2
hercules-dfd9bcd2b9a77ff69d10add1f3b82566b1c87abe.tar.xz
hercules-dfd9bcd2b9a77ff69d10add1f3b82566b1c87abe.zip
* Users can't click floating npcs directly. (quick fix for bugreport:1814)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12930 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/clif.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index cf9d78c89..c5690fedf 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,8 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
+2008/07/10
+ * Users can't click floating npcs directly. (quick fix for bugreport:1814) [FlavioJS]
2008/07/09
* Fixed SG_FUSION hp penalty (0.5% to 2%), bugreport:1805 [Brainstorm]
* Added const to the return value of get_timer.
diff --git a/src/map/clif.c b/src/map/clif.c
index 0b2aa773e..fec866dc0 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -8874,7 +8874,8 @@ void clif_parse_NpcClicked(int fd,struct map_session_data *sd)
clif_parse_ActionRequest_sub(sd, 0x07, bl->id, gettick());
break;
case BL_NPC:
- npc_click(sd,(TBL_NPC*)bl);
+ if( bl->m != -1 )// the user can't click floating npcs directly (hack attempt)
+ npc_click(sd,(TBL_NPC*)bl);
break;
}
return;