Explorar o código

After discussion with Sami realized changes to deadPlayer should in fact be killer...

Ahmed %!s(int64=17) %!d(string=hai) anos
pai
achega
514627a55e

+ 20 - 15
L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2PcInstance.java

@@ -4631,25 +4631,26 @@ public final class L2PcInstance extends L2PlayableInstance
      * <li>Kill the L2PcInstance </li><BR><BR>
      *
      *
-     * @param deadPlayer - Player that has died.
+     * @param i The HP decrease value
+     * @param attacker The L2Character who attacks
      *
      *
 	 * @see net.sf.l2j.gameserver.model.actor.instance.L2PlayableInstance#doDie(net.sf.l2j.gameserver.model.L2Character)
 	 */
 	@Override
-	public boolean doDie(L2Character deadPlayer)
+	public boolean doDie(L2Character killer)
 	{
 		// Kill the L2PcInstance
-		if (!super.doDie(deadPlayer))
+		if (!super.doDie(killer))
 			return false;
 
-		if (deadPlayer != null)
+		if (killer != null)
 		{
 			L2PcInstance pk = null;
-			if (deadPlayer instanceof L2PcInstance)
-				pk = (L2PcInstance) deadPlayer;
+			if (killer instanceof L2PcInstance)
+				pk = (L2PcInstance) killer;
 
-			TvTEvent.onKill(deadPlayer, this);
+			TvTEvent.onKill(killer, this);
 
 			if (atEvent && pk != null)
 			{
@@ -4662,7 +4663,7 @@ public final class L2PcInstance extends L2PlayableInstance
 			// Issues drop of Cursed Weapon.
 			if (isCursedWeaponEquipped())
 			{
-				CursedWeaponsManager.getInstance().drop(_cursedWeaponEquippedId, deadPlayer);
+				CursedWeaponsManager.getInstance().drop(_cursedWeaponEquippedId, killer);
 			}
 			else if (isCombatFlagEquipped())
             {
@@ -4674,17 +4675,21 @@ public final class L2PcInstance extends L2PlayableInstance
 				if (pk == null || !pk.isCursedWeaponEquipped())
 				{
 					//if (getKarma() > 0)
-						onDieDropItem(deadPlayer);  // Check if any item should be dropped
+						onDieDropItem(killer);  // Check if any item should be dropped
 
 					if (!(isInsideZone(ZONE_PVP) && !isInsideZone(ZONE_SIEGE)))
 					{
-						boolean isDeadPlayerPc = (deadPlayer instanceof L2PcInstance);
-		                if (isDeadPlayerPc && ((L2PcInstance)deadPlayer).getClan() != null && getClan() != null && !isAcademyMember() && !(((L2PcInstance)deadPlayer).isAcademyMember()) && _clan.isAtWarWith(((L2PcInstance) deadPlayer).getClanId()) && ((L2PcInstance)deadPlayer).getClan().isAtWarWith(_clan.getClanId()))
+						boolean isKillerPc = (killer instanceof L2PcInstance);
+		                if (isKillerPc && ((L2PcInstance)killer).getClan() != null
+		                               && getClan() != null
+                                   && !isAcademyMember()
+                                   && !(((L2PcInstance)killer).isAcademyMember())
+		                               && _clan.isAtWarWith(((L2PcInstance) killer).getClanId())
+		                               && ((L2PcInstance)killer).getClan().isAtWarWith(_clan.getClanId()))
 		                {
 		                    if (getClan().getReputationScore() > 0) // when your reputation score is 0 or below, the other clan cannot acquire any reputation points
-		                		((L2PcInstance) deadPlayer).getClan().setReputationScore(((L2PcInstance) deadPlayer).getClan().getReputationScore()+2, true);
-		                    
-		                    if (((L2PcInstance)deadPlayer).getClan().getReputationScore() > 0) // when the opposing sides reputation score is 0 or below, your clans reputation score does not decrease
+		                		((L2PcInstance) killer).getClan().setReputationScore(((L2PcInstance) killer).getClan().getReputationScore()+2, true);
+		                    if (((L2PcInstance)killer).getClan().getReputationScore() > 0) // when the opposing sides reputation score is 0 or below, your clans reputation score does not decrease
 		                    	_clan.setReputationScore(_clan.getReputationScore()-2, true);
 		                }
 						if (Config.ALT_GAME_DELEVEL)
@@ -4733,7 +4738,7 @@ public final class L2PcInstance extends L2PlayableInstance
 			getParty().getDimensionalRift().getDeadMemberList().add(this);
 
 		// calculate death penalty buff
-		calculateDeathPenaltyBuffLevel(deadPlayer);
+		calculateDeathPenaltyBuffLevel(killer);
 
 		stopRentPet();
 		stopWaterTask();

+ 1 - 1
L2_GameServer/java/net/sf/l2j/gameserver/model/base/Experience.java

@@ -113,7 +113,7 @@ public class Experience
 
 	/**
 	 * This is the first UNREACHABLE level.<BR>
-	 *   ex: If you want a max at 80 & 99.99%, you have to put 81.<BR><BR>
+	 *   ex: If you want a max at 85 & 99.99%, you have to put 86.<BR><BR>
 	 */
 	public final static byte MAX_LEVEL = 86;