Changeset 2284

Timestamp:

07/15/08 17:52:18 (3 months ago)

Author:

DrHouse

Message:

Fix for Charm of Courage benefits after dying. (Since effect is removed after dying, blessing status was bypassed)

Fixes #2829 , thanks _DS_ for reporting

Files:

• trunk/L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2PcInstance.java (modified) (5 diffs)

trunk/L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2PcInstance.java

@@ -4670 +4670 @@
-        public boolean doDie(L2Character killer)
-        {
+                /* Since L2Character.doDie() calls stopAllEffects(), which includes
+                 * setting charm of curage and other blessings as false, this stores value 
+                 * before calling superclass method
+                 */
+                boolean charmOfCourage = getCharmOfCourage();
+                
-                // Kill the L2PcInstance
-                if (!super.doDie(killer))
@@ -4737 +4743 @@
-                                                        // Penalty is lower if the player is at war with the pk (war has to be declared)
-                                                        if (getSkillLevel(L2Skill.SKILL_LUCKY) < 0 || getStat().getLevel() > 9)
-
+, charmOfCourage
-
-                                                } else
@@ -5139 +5145 @@
-         *
-         */
-
+, boolean charmOfCourage
-        {
-                // TODO Need Correct Penalty
@@ -5228 +5234 @@
-                setExpBeforeDeath(getExp());
-
-getCharmOfCourage()
+charmOfCourage
-                {
-                    if (getSiegeState() > 0 && isInsideZone(ZONE_SIEGE))
@@ -5239 +5245 @@
-                // Set the new Experience value of the L2PcInstance
-                getStat().addExp(-lostExp);
+        }
+        
+        public void deathPenalty(boolean atwar, boolean killed_by_pc)
+        {
+                deathPenalty(atwar, killed_by_pc, getCharmOfCourage());
-        }
-