diff options
| author | blackhole89 <blackhole89@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-12-27 17:56:14 +0000 |
|---|---|---|
| committer | blackhole89 <blackhole89@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-12-27 17:56:14 +0000 |
| commit | a492f2db8d6fb1916ff30d9ddc2da62b24797725 (patch) | |
| tree | ebe7d9dfd231cc398153339ab093dc3854936ecb | |
| parent | 4efd46167e2d7f8b894754dacf61238a389ea47b (diff) | |
| download | hercules-a492f2db8d6fb1916ff30d9ddc2da62b24797725.tar.gz hercules-a492f2db8d6fb1916ff30d9ddc2da62b24797725.tar.bz2 hercules-a492f2db8d6fb1916ff30d9ddc2da62b24797725.tar.xz hercules-a492f2db8d6fb1916ff30d9ddc2da62b24797725.zip | |
minor fix; see Changelog-Trunk.txt
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9581 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 4 | ||||
| -rw-r--r-- | src/map/pc.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index c67461b77..482a627ed 100644 --- a/Changelog-Trunk.txt +++ b/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 diff --git a/src/map/pc.c b/src/map/pc.c index 9f72f82c1..fc61a65ba 100644 --- a/src/map/pc.c +++ b/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; } |