summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt3
-rw-r--r--src/map/status.c8
2 files changed, 5 insertions, 6 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index ee27cb91c..364ff309e 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,7 +3,8 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
09/05/10
- * Magnetic Earth will never stack(bugreport:2568) [Inkfish]
+ * Magnetic Earth will never stack (bugreport:2568) [Inkfish]
+ * Fixed Joint Beat incorrect DEF reduction (bugreport:3051) [Inkfish]
09/05/09
* Fixed GX's skill level modifier is missing [Inkfish]
* Fixed some known and unknown player attached NPC timer problems [Inkfish]
diff --git a/src/map/status.c b/src/map/status.c
index 792c225d0..8cb891169 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -3758,11 +3758,9 @@ static signed short status_calc_def2(struct block_list *bl, struct status_change
def2 -= def2 * 50/100;
if(sc->data[SC_PROVOKE])
def2 -= def2 * sc->data[SC_PROVOKE]->val4/100;
- if(sc->data[SC_JOINTBEAT]){
- def2 -= def2 *
- ( ( sc->data[SC_JOINTBEAT]->val2&BREAK_SHOULDER ? 50 : 0 )
- + ( sc->data[SC_JOINTBEAT]->val2&BREAK_WAIST ? 25 : 0 ) );
- }
+ if(sc->data[SC_JOINTBEAT])
+ def2 -= def2 * ( sc->data[SC_JOINTBEAT]->val2&BREAK_SHOULDER ? 50 : 0 ) / 100
+ + def2 * ( sc->data[SC_JOINTBEAT]->val2&BREAK_WAIST ? 25 : 0 ) / 100;
if(sc->data[SC_FLING])
def2 -= def2 * (sc->data[SC_FLING]->val3)/100;