summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-07-18 02:18:40 +0000
committerInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-07-18 02:18:40 +0000
commitba450a6e6856b2e2cf3f3590a43907f0d80f1d17 (patch)
treeb218fdbc19396ff5980a9eb27be7734742e61e4b
parent237951bb0f15b09622d0a9cf1a248f1e38123d50 (diff)
downloadhercules-ba450a6e6856b2e2cf3f3590a43907f0d80f1d17.tar.gz
hercules-ba450a6e6856b2e2cf3f3590a43907f0d80f1d17.tar.bz2
hercules-ba450a6e6856b2e2cf3f3590a43907f0d80f1d17.tar.xz
hercules-ba450a6e6856b2e2cf3f3590a43907f0d80f1d17.zip
* Dead branches no longer check for players' level. (bugreport:3378)
* The Lovers Card won't teleport anyone on PVP/WoE/BG maps. (bugreport:3371) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13952 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt3
-rw-r--r--src/map/mob.c2
-rw-r--r--src/map/skill.c3
3 files changed, 6 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 2d9b0a19e..4a84ad664 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,9 @@ 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.
+09/07/17
+ * Dead branches no longer check for players' level. (bugreport:3378) [Inkfish]
+ * The Lovers Card won't teleport anyone on PVP/WoE/BG maps. (bugreport:3371) [Inkfish]
09/07/11
* Some updates for range check. (bugreport:3339) [Inkfish]
- Monsters shouldn't use skills if the target is within its attack range but is out of the skill range.
diff --git a/src/map/mob.c b/src/map/mob.c
index e6fa8d2fd..9e319eb42 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -411,7 +411,7 @@ int mob_once_spawn(struct map_session_data* sd, int m, short x, short y, const c
for (count = 0; count < amount; count++)
{
- int c = ( class_ >= 0 ) ? class_ : mob_get_random_id(-class_-1, battle_config.random_monster_checklv?3:1, lv);
+ int c = ( class_ >= 0 ) ? class_ : mob_get_random_id(-class_-1, !battle_config.random_monster_checklv?3:1, lv);
md = mob_once_spawn_sub(sd?&sd->bl:NULL, m, x, y, mobname, c, event);
if (!md) continue;
diff --git a/src/map/skill.c b/src/map/skill.c
index 7d82e032c..aebfc9eee 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -5332,7 +5332,8 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
break;
case 5: // 2000HP heal, random teleported
status_heal(bl, 2000, 0, 0);
- unit_warp(bl, -1,-1,-1, 3);
+ if( !map_flag_vs(bl->m) )
+ unit_warp(bl, -1,-1,-1, 3);
break;
case 6: // random 2 other effects
if (count == -1)