3 files changed, 8 insertions, 4 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 5895cde7a..ec3fa97a4 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ 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/04/01

+	* Fixed berserk not raising your HP to your new cap. [Skotlex]

+	* Fixed ground-skills not displaying damage done. [Skotlex]

 	* Fixed a few functions sending a negative ID for disguised characters

 	  (such as clif_specialeffect) which very likely produced client crashes.

 	  [Skotlex]

diff --git a/src/map/clif.c b/src/map/clif.c
index 6636865c9..21c8bcbcc 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -4412,8 +4412,10 @@ int clif_skill_setunit(struct skill_unit *unit)
 

 	bl=map_id2bl(unit->group->src_id);

 

-	if (unit->group->unit_id == UNT_ATTACK_SKILLS)

-		return 0;	//These are invisible client-side. [Skotlex]

+// These are invisible client-side, but are necessary because

+// otherwise the client will not know who caused the attack.

+//	if (unit->group->unit_id == UNT_ATTACK_SKILLS)

+//		return 0;

 		

 #if PACKETVER < 3

 	memset(WBUFP(buf, 0),0,packet_len_table[0x11f]);

diff --git a/src/map/status.c b/src/map/status.c
index 8d1028427..cb97017b1 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -4235,6 +4235,8 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val
 			break;

 

 		case SC_BERSERK:		/* ƒo?ƒT?ƒN */

+			if (sc->data[SC_ENDURE].timer == -1 || sc->data[SC_ENDURE].val1 <= 10)

+				sc_start(bl, SC_ENDURE, 100, 11, tick);

 			if(sd && !(flag&4)){

 				sd->status.hp = sd->status.max_hp * 3;

 				sd->status.sp = 0;

@@ -4244,8 +4246,6 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val
 			}

 			if (!(flag&4))

 				tick = 10000;

-			if (sc->data[SC_ENDURE].timer == -1 || sc->data[SC_ENDURE].val1 <= 10)

-				sc_start(bl, SC_ENDURE, 100, 11, tick);

 			calc_flag = 1;

 			break;