Character doDie should be executed before calculateDeathExpPenalty.

Author: p3110145 Source: 5124056572
2015-10-03 21:49:45 +00:00
parent de3a25474f
commit 1322852e42
1 changed files with 6 additions and 6 deletions
--- a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java
+++ b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java
@ -5325,6 +5325,12 @@ public final class L2PcInstance extends L2Playable
 			// Clear resurrect xp calculation
 			setExpBeforeDeath(0);
 			
+			// Kill the L2PcInstance
+			if (!super.doDie(killer))
+			{
+				return false;
+			}
+			
 			// Issues drop of Cursed Weapon.
 			if (isCursedWeaponEquipped())
 			{
@ -5385,12 +5391,6 @@ public final class L2PcInstance extends L2Playable
 		// calculate Shilen's Breath debuff level
 		calculateShilensBreathDebuffLevel(killer);
 		
-		// Kill the L2PcInstance
-		if (!super.doDie(killer))
-		{
-			return false;
-		}
-		
 		if (isMounted())
 		{
 			stopFeed();