浏览代码

minor fix; see Changelog-Trunk.txt

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

+ 3 - 1
Changelog-Trunk.txt

@@ -4,13 +4,15 @@ 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/12/27
+	* Fixed Super Novice 99%+ invincibility triggering when
+	  the character dies in a GvG area. [blackhole89]
 	* Updated SQL Files [Toms]
 	* Fixed a bug which makes the group heal bonus be applied as many times as
 	  the item is in that group.
 	* Applied Rayce's suggestion to improve the script hash size usage. eA now
 	  uses a hash of 1024.
 	* Full Buster's auto-blind chance is now reducable by stats/items.
-2006/12/26
+2006/12/2
 	* Updated Charge Attack's damage equation as per the only source I've seen
 	  of it so far.
 	* Now Guardians/Emperium can't hit /be hit if their current map isn't a

+ 1 - 1
src/map/pc.c

@@ -4972,7 +4972,7 @@ int pc_dead(struct map_session_data *sd,struct block_list *src)
 	if ((sd->class_&MAPID_UPPERMASK) == MAPID_SUPER_NOVICE) {
 		if ((i=pc_nextbaseexp(sd))<=0)
 			i=sd->status.base_exp;
-		if (i>0 && (j=sd->status.base_exp*1000/i)>=990 && j<1000)
+		if (i>0 && (j=sd->status.base_exp*1000/i)>=990 && j<1000 && !map_flag_gvg(sd->bl.m))
 			sd->state.snovice_flag = 4;
 	}