From 6fc7c2a2614eeb39ac8a6f62e8d4998b7860fd27 Mon Sep 17 00:00:00 2001 From: skotlex Date: Fri, 5 May 2006 14:20:42 +0000 Subject: - Added a check to prevent player invoked-endure from overriding infinite endure. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6488 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/status.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/map/status.c b/src/map/status.c index be58f7792..ce195049d 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -3932,8 +3932,17 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val break; case SC_GOSPEL: //Must not override a casting gospel char. - if (sc->data[type].val4 == BCT_SELF) + if(sc->data[type].val4 == BCT_SELF) return 0; + if(sc->data[type].val1 > val1) + return 1; + break; + case SC_ENDURE: + if(sc->data[type].val4 && !val4) + return 1; //Don't let you override infinite endure. + if(sc->data[type].val1 > val1) + return 1; + break; case SC_KAAHI: if(sc->data[type].val1 > val1) return 1; @@ -4302,7 +4311,7 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val case SC_BERSERK: /* ƒo?ƒT?ƒN */ if (sc->data[SC_ENDURE].timer == -1 || !sc->data[SC_ENDURE].val4) - sc_start4(bl, SC_ENDURE, 100, 1,0,0,1, tick); + sc_start4(bl, SC_ENDURE, 100,10,0,0,1, tick); if(sd && !(flag&4)){ sd->status.hp = sd->status.max_hp * 3; sd->status.sp = 0; -- cgit v1.2.3-70-g09d2