* 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://svn.code.sf.net/p/rathena/svn/trunk@13952 54d463be-8e91-2dee-dedb-b68131a5f0ec

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.

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;

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)