浏览代码

- Fixed crash in AL_TELEPORT.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5305 54d463be-8e91-2dee-dedb-b68131a5f0ec
skotlex 19 年之前
父节点
当前提交
a7d78d7670
共有 2 个文件被更改,包括 3 次插入2 次删除
  1. 1 0
      Changelog-Trunk.txt
  2. 2 2
      src/map/skill.c

+ 1 - 0
Changelog-Trunk.txt

@@ -4,6 +4,7 @@ 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.  EVERYTHING ELSE
 GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
 2006/02/16
+	* Fixed a crash in AL_TELEPORT. [Skotlex]
 	* Now you can't close-confine and already confined mob. [Skotlex]
 	* mysql/my_global.h now includes winnt.h under Windows systems... [Skotlex]
 	* Some code cleanup of status.c [Skotlex]

+ 2 - 2
src/map/skill.c

@@ -4327,7 +4327,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
 
 	case AL_TELEPORT:			/* テレポ?ト */
 		if(sd) {
-			if (map[sd->bl.m].flag.noteleport) {	/* テレポ禁止 */
+			if (map[bl->m].flag.noteleport) {	/* テレポ禁止 */
 				clif_skill_teleportmessage(sd,0);
 				break;
 			}
@@ -4351,7 +4351,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
 					pc_setpos(sd,sd->status.save_point.map,
 						sd->status.save_point.x,sd->status.save_point.y,3);
 			}
-		} else if(dstmd && !map[sd->bl.m].flag.monster_noteleport)
+		} else if(dstmd && !map[bl->m].flag.monster_noteleport)
 			mob_warp(dstmd,-1,-1,-1,3);
 		break;