summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-04-07 08:56:54 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-04-07 08:56:54 +0000
commitcbf0ed85bcaac6e044dee6b0af2f31cacb903af4 (patch)
treeb12c56cb760e15ea4397129b88cdeb5f36429c44
parent1f1f468a783b8782eb1eae2c9f4a9c96adefe8ef (diff)
downloadhercules-cbf0ed85bcaac6e044dee6b0af2f31cacb903af4.tar.gz
hercules-cbf0ed85bcaac6e044dee6b0af2f31cacb903af4.tar.bz2
hercules-cbf0ed85bcaac6e044dee6b0af2f31cacb903af4.tar.xz
hercules-cbf0ed85bcaac6e044dee6b0af2f31cacb903af4.zip
Improved the Mental Sensing fix from r12507 to not start the status at all, instead of starting it and ignoring it later on.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12519 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/map/mob.c2
-rw-r--r--src/map/status.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/map/mob.c b/src/map/mob.c
index 882605675..6463c2103 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -2166,7 +2166,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
(!map[m].flag.nobaseexp || !map[m].flag.nojobexp) //Gives Exp
) { //Experience calculation.
int bonus = 100; //Bonus on top of your share (common to all attackers).
- if (md->sc.data[SC_RICHMANKIM] && !(status_get_mode(&md->bl)&MD_BOSS))
+ if (md->sc.data[SC_RICHMANKIM])
bonus += md->sc.data[SC_RICHMANKIM]->val2;
if(sd) {
temp = status_get_class(&md->bl);
diff --git a/src/map/status.c b/src/map/status.c
index aaabeebaa..8f756d0ca 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -4818,7 +4818,6 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val
case SC_QUAGMIRE:
case SC_DECREASEAGI:
case SC_PROVOKE:
- case SC_ROKISWEIL:
case SC_COMA:
case SC_GRAVITATION:
case SC_SUITON:
@@ -4826,6 +4825,8 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val
case SC_STRIPSHIELD:
case SC_STRIPARMOR:
case SC_STRIPHELM:
+ case SC_RICHMANKIM:
+ case SC_ROKISWEIL:
return 0;
}
}