summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-19 19:02:46 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-19 19:02:46 +0000
commit2e50f09a95b1a7af3df9fedc9329f0529d3cdcda (patch)
tree8dd3a0d0ea3ad7cfa1662f0861f46aba747264aa
parent8b397b940a270a4e4107f76614339742a8c5a257 (diff)
downloadhercules-2e50f09a95b1a7af3df9fedc9329f0529d3cdcda.tar.gz
hercules-2e50f09a95b1a7af3df9fedc9329f0529d3cdcda.tar.bz2
hercules-2e50f09a95b1a7af3df9fedc9329f0529d3cdcda.tar.xz
hercules-2e50f09a95b1a7af3df9fedc9329f0529d3cdcda.zip
- Fixed pc_set_hate_mob letting you place mobs on any of the three positions regardless of size :/
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8813 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/pc.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 45a600881..c743e1800 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/09/19
+ * Fixed pc_set_hate_mob letting you place mobs on any of the three
+ positions regardless of size [Skotlex]
* The double continuation error will now display both scripts that
triggered it. [Skotlex]
* Loading the storage from the char-server will fail if player is already
diff --git a/src/map/pc.c b/src/map/pc.c
index 740bd13b7..975c4a5c7 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -785,6 +785,8 @@ int pc_set_hate_mob(struct map_session_data *sd, int pos, struct block_list *bl)
unsigned int max_hp = status_get_max_hp(bl);
if ((pos == 1 && max_hp < 6000) || (pos == 2 && max_hp < 20000))
return 0;
+ if (pos != status_get_size(bl))
+ return 0; //Wrong size
}
sd->hate_mob[pos] = class_;
pc_setglobalreg(sd,hate_var[pos],class_+1);