summaryrefslogtreecommitdiff
path: root/src/map/pc.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-28 15:11:17 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-28 15:11:17 +0000
commita5a5d08082d272690f89389db6029edf94fe551d (patch)
tree2dd9e2d74cd230904f53b4164570df2d6542ca48 /src/map/pc.c
parent71140a6d9bb8b15fdee82745b559db0ca6a0052d (diff)
downloadhercules-a5a5d08082d272690f89389db6029edf94fe551d.tar.gz
hercules-a5a5d08082d272690f89389db6029edf94fe551d.tar.bz2
hercules-a5a5d08082d272690f89389db6029edf94fe551d.tar.xz
hercules-a5a5d08082d272690f89389db6029edf94fe551d.zip
- Cleaned up the NJ update code.
- Restored code which was removed (stuff like SC_SKA) - Fixed possible crashes on some NJ skills if used by non-players. - Fixed most NJ magic spells doing more damage than they should. - Fixed ZenyNage being able to do more damage than zeny you have. - Cleaned up skill setting code for Suiton and Kaensin - Ordered SC_* definitions in status.c git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7947 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pc.c')
-rw-r--r--src/map/pc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/pc.c b/src/map/pc.c
index 5e20aaa4a..5af6a080e 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -3231,7 +3231,7 @@ int pc_setpos(struct map_session_data *sd,unsigned short mapindex,int x,int y,in
{ //Misc map-changing settings
party_send_dot_remove(sd); //minimap dot fix [Kevin]
guild_send_dot_remove(sd);
- skill_clear_group(&sd->bl, 1|(battle_config.traps_setting&2));
+ skill_clear_group(&sd->bl, 1|4|(battle_config.traps_setting&2));
if (sd->sc.count)
{ //Cancel some map related stuff.
if (sd->sc.data[SC_WARM].timer != -1)