Addition of getMainDamageDealer method.

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -726,6 +726,27 @@ public class Attackable extends Npc
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
+	public Creature getMainDamageDealer()
+	{
+		if (_aggroList.isEmpty())
+		{
+			return null;
+		}
+		
+		int damage = 0;
+		Creature damageDealer = null;
+		for (AggroInfo info : _aggroList.values())
+		{
+			if ((info != null) && (info.getDamage() > damage) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, this, info.getAttacker(), true))
+			{
+				damage = info.getDamage();
+				damageDealer = info.getAttacker();
+			}
+		}
+		
+		return damageDealer;
+	}
+	
 	/**
 	 * Add damage and hate to the attacker AggroInfo of the Attackable _aggroList.
 	 * @param attacker The Creature that gave damages to this Attackable

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1692,7 +1692,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		abortAttack();
 		abortCast();
 		
-		calculateRewards(killer);
+		// Calculate rewards for main damage dealer.
+		final Creature mainDamageDealer = isMonster() ? ((MonsterInstance) this).getMainDamageDealer() : null;
+		calculateRewards(mainDamageDealer != null ? mainDamageDealer : killer);
 		
 		// Set target to null and cancel Attack or Cast
 		setTarget(null);

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -722,6 +722,27 @@ public class Attackable extends Npc
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
+	public Creature getMainDamageDealer()
+	{
+		if (_aggroList.isEmpty())
+		{
+			return null;
+		}
+		
+		int damage = 0;
+		Creature damageDealer = null;
+		for (AggroInfo info : _aggroList.values())
+		{
+			if ((info != null) && (info.getDamage() > damage) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, this, info.getAttacker(), true))
+			{
+				damage = info.getDamage();
+				damageDealer = info.getAttacker();
+			}
+		}
+		
+		return damageDealer;
+	}
+	
 	/**
 	 * Add damage and hate to the attacker AggroInfo of the Attackable _aggroList.
 	 * @param attacker The Creature that gave damages to this Attackable

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1692,7 +1692,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		abortAttack();
 		abortCast();
 		
-		calculateRewards(killer);
+		// Calculate rewards for main damage dealer.
+		final Creature mainDamageDealer = isMonster() ? ((MonsterInstance) this).getMainDamageDealer() : null;
+		calculateRewards(mainDamageDealer != null ? mainDamageDealer : killer);
 		
 		// Set target to null and cancel Attack or Cast
 		setTarget(null);

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -722,6 +722,27 @@ public class Attackable extends Npc
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
+	public Creature getMainDamageDealer()
+	{
+		if (_aggroList.isEmpty())
+		{
+			return null;
+		}
+		
+		int damage = 0;
+		Creature damageDealer = null;
+		for (AggroInfo info : _aggroList.values())
+		{
+			if ((info != null) && (info.getDamage() > damage) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, this, info.getAttacker(), true))
+			{
+				damage = info.getDamage();
+				damageDealer = info.getAttacker();
+			}
+		}
+		
+		return damageDealer;
+	}
+	
 	/**
 	 * Add damage and hate to the attacker AggroInfo of the Attackable _aggroList.
 	 * @param attacker The Creature that gave damages to this Attackable

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1692,7 +1692,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		abortAttack();
 		abortCast();
 		
-		calculateRewards(killer);
+		// Calculate rewards for main damage dealer.
+		final Creature mainDamageDealer = isMonster() ? ((MonsterInstance) this).getMainDamageDealer() : null;
+		calculateRewards(mainDamageDealer != null ? mainDamageDealer : killer);
 		
 		// Set target to null and cancel Attack or Cast
 		setTarget(null);

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -722,6 +722,27 @@ public class Attackable extends Npc
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
+	public Creature getMainDamageDealer()
+	{
+		if (_aggroList.isEmpty())
+		{
+			return null;
+		}
+		
+		int damage = 0;
+		Creature damageDealer = null;
+		for (AggroInfo info : _aggroList.values())
+		{
+			if ((info != null) && (info.getDamage() > damage) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, this, info.getAttacker(), true))
+			{
+				damage = info.getDamage();
+				damageDealer = info.getAttacker();
+			}
+		}
+		
+		return damageDealer;
+	}
+	
 	/**
 	 * Add damage and hate to the attacker AggroInfo of the Attackable _aggroList.
 	 * @param attacker The Creature that gave damages to this Attackable

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1692,7 +1692,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		abortAttack();
 		abortCast();
 		
-		calculateRewards(killer);
+		// Calculate rewards for main damage dealer.
+		final Creature mainDamageDealer = isMonster() ? ((MonsterInstance) this).getMainDamageDealer() : null;
+		calculateRewards(mainDamageDealer != null ? mainDamageDealer : killer);
 		
 		// Set target to null and cancel Attack or Cast
 		setTarget(null);

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -708,6 +708,27 @@ public class Attackable extends Npc
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
+	public Creature getMainDamageDealer()
+	{
+		if (_aggroList.isEmpty())
+		{
+			return null;
+		}
+		
+		int damage = 0;
+		Creature damageDealer = null;
+		for (AggroInfo info : _aggroList.values())
+		{
+			if ((info != null) && (info.getDamage() > damage) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, this, info.getAttacker(), true))
+			{
+				damage = info.getDamage();
+				damageDealer = info.getAttacker();
+			}
+		}
+		
+		return damageDealer;
+	}
+	
 	/**
 	 * Add damage and hate to the attacker AggroInfo of the Attackable _aggroList.
 	 * @param attacker The Creature that gave damages to this Attackable

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1692,7 +1692,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		abortAttack();
 		abortCast();
 		
-		calculateRewards(killer);
+		// Calculate rewards for main damage dealer.
+		final Creature mainDamageDealer = isMonster() ? ((MonsterInstance) this).getMainDamageDealer() : null;
+		calculateRewards(mainDamageDealer != null ? mainDamageDealer : killer);
 		
 		// Set target to null and cancel Attack or Cast
 		setTarget(null);

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -708,6 +708,27 @@ public class Attackable extends Npc
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
+	public Creature getMainDamageDealer()
+	{
+		if (_aggroList.isEmpty())
+		{
+			return null;
+		}
+		
+		int damage = 0;
+		Creature damageDealer = null;
+		for (AggroInfo info : _aggroList.values())
+		{
+			if ((info != null) && (info.getDamage() > damage) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, this, info.getAttacker(), true))
+			{
+				damage = info.getDamage();
+				damageDealer = info.getAttacker();
+			}
+		}
+		
+		return damageDealer;
+	}
+	
 	/**
 	 * Add damage and hate to the attacker AggroInfo of the Attackable _aggroList.
 	 * @param attacker The Creature that gave damages to this Attackable

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1692,7 +1692,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		abortAttack();
 		abortCast();
 		
-		calculateRewards(killer);
+		// Calculate rewards for main damage dealer.
+		final Creature mainDamageDealer = isMonster() ? ((MonsterInstance) this).getMainDamageDealer() : null;
+		calculateRewards(mainDamageDealer != null ? mainDamageDealer : killer);
 		
 		// Set target to null and cancel Attack or Cast
 		setTarget(null);

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -708,6 +708,27 @@ public class Attackable extends Npc
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
+	public Creature getMainDamageDealer()
+	{
+		if (_aggroList.isEmpty())
+		{
+			return null;
+		}
+		
+		int damage = 0;
+		Creature damageDealer = null;
+		for (AggroInfo info : _aggroList.values())
+		{
+			if ((info != null) && (info.getDamage() > damage) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, this, info.getAttacker(), true))
+			{
+				damage = info.getDamage();
+				damageDealer = info.getAttacker();
+			}
+		}
+		
+		return damageDealer;
+	}
+	
 	/**
 	 * Add damage and hate to the attacker AggroInfo of the Attackable _aggroList.
 	 * @param attacker The Creature that gave damages to this Attackable

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1692,7 +1692,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		abortAttack();
 		abortCast();
 		
-		calculateRewards(killer);
+		// Calculate rewards for main damage dealer.
+		final Creature mainDamageDealer = isMonster() ? ((MonsterInstance) this).getMainDamageDealer() : null;
+		calculateRewards(mainDamageDealer != null ? mainDamageDealer : killer);
 		
 		// Set target to null and cancel Attack or Cast
 		setTarget(null);

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -719,6 +719,27 @@ public class Attackable extends Npc
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
+	public Creature getMainDamageDealer()
+	{
+		if (_aggroList.isEmpty())
+		{
+			return null;
+		}
+		
+		int damage = 0;
+		Creature damageDealer = null;
+		for (AggroInfo info : _aggroList.values())
+		{
+			if ((info != null) && (info.getDamage() > damage) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, this, info.getAttacker(), true))
+			{
+				damage = info.getDamage();
+				damageDealer = info.getAttacker();
+			}
+		}
+		
+		return damageDealer;
+	}
+	
 	/**
 	 * Add damage and hate to the attacker AggroInfo of the Attackable _aggroList.
 	 * @param attacker The Creature that gave damages to this Attackable

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1692,7 +1692,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		abortAttack();
 		abortCast();
 		
-		calculateRewards(killer);
+		// Calculate rewards for main damage dealer.
+		final Creature mainDamageDealer = isMonster() ? ((MonsterInstance) this).getMainDamageDealer() : null;
+		calculateRewards(mainDamageDealer != null ? mainDamageDealer : killer);
 		
 		// Set target to null and cancel Attack or Cast
 		setTarget(null);

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -719,6 +719,27 @@ public class Attackable extends Npc
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
+	public Creature getMainDamageDealer()
+	{
+		if (_aggroList.isEmpty())
+		{
+			return null;
+		}
+		
+		int damage = 0;
+		Creature damageDealer = null;
+		for (AggroInfo info : _aggroList.values())
+		{
+			if ((info != null) && (info.getDamage() > damage) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, this, info.getAttacker(), true))
+			{
+				damage = info.getDamage();
+				damageDealer = info.getAttacker();
+			}
+		}
+		
+		return damageDealer;
+	}
+	
 	/**
 	 * Add damage and hate to the attacker AggroInfo of the Attackable _aggroList.
 	 * @param attacker The Creature that gave damages to this Attackable

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1692,7 +1692,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		abortAttack();
 		abortCast();
 		
-		calculateRewards(killer);
+		// Calculate rewards for main damage dealer.
+		final Creature mainDamageDealer = isMonster() ? ((MonsterInstance) this).getMainDamageDealer() : null;
+		calculateRewards(mainDamageDealer != null ? mainDamageDealer : killer);
 		
 		// Set target to null and cancel Attack or Cast
 		setTarget(null);

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -719,6 +719,27 @@ public class Attackable extends Npc
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
+	public Creature getMainDamageDealer()
+	{
+		if (_aggroList.isEmpty())
+		{
+			return null;
+		}
+		
+		int damage = 0;
+		Creature damageDealer = null;
+		for (AggroInfo info : _aggroList.values())
+		{
+			if ((info != null) && (info.getDamage() > damage) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, this, info.getAttacker(), true))
+			{
+				damage = info.getDamage();
+				damageDealer = info.getAttacker();
+			}
+		}
+		
+		return damageDealer;
+	}
+	
 	/**
 	 * Add damage and hate to the attacker AggroInfo of the Attackable _aggroList.
 	 * @param attacker The Creature that gave damages to this Attackable

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1692,7 +1692,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		abortAttack();
 		abortCast();
 		
-		calculateRewards(killer);
+		// Calculate rewards for main damage dealer.
+		final Creature mainDamageDealer = isMonster() ? ((MonsterInstance) this).getMainDamageDealer() : null;
+		calculateRewards(mainDamageDealer != null ? mainDamageDealer : killer);
 		
 		// Set target to null and cancel Attack or Cast
 		setTarget(null);

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -920,6 +920,27 @@ public class Attackable extends NpcInstance
 		}
 	}
 	
+	public Creature getMainDamageDealer()
+	{
+		if (_aggroList.isEmpty())
+		{
+			return null;
+		}
+		
+		int damage = 0;
+		Creature damageDealer = null;
+		for (AggroInfo info : _aggroList.values())
+		{
+			if ((info != null) && (info._damage > damage) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, this, info._attacker, true))
+			{
+				damage = info._damage;
+				damageDealer = info._attacker;
+			}
+		}
+		
+		return damageDealer;
+	}
+	
 	/**
 	 * Add damage and hate to the attacker AggroInfo of the Attackable _aggroList.
 	 * @param attacker The Creature that gave damages to this Attackable

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1774,6 +1774,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
 			
 			setKilledAlready(true);
 		}
+		
+		// Calculate rewards for main damage dealer.
+		final Creature mainDamageDealer = isMonster() ? ((MonsterInstance) this).getMainDamageDealer() : null;
+		calculateRewards(mainDamageDealer != null ? mainDamageDealer : killer);
+		
 		// Set target to null and cancel Attack or Cast
 		setTarget(null);
 		
@@ -1842,28 +1847,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
 				stopAllEffects();
 			}
 		}
-		else
+		else // this means all other characters, including Summons
-		// this means all other characters, including Summons
 		{
 			stopAllEffects();
 		}
 		
-		// if killer is the same then the most damager/hated
-		Creature mostHated = null;
-		if (this instanceof Attackable)
-		{
-			mostHated = ((Attackable) this)._mostHated;
-		}
-		
-		if ((mostHated != null) && isInsideRadius2D(mostHated, 200))
-		{
-			calculateRewards(mostHated);
-		}
-		else
-		{
-			calculateRewards(killer);
-		}
-		
 		// Send the Server->Client packet StatusUpdate with current HP and MP to all other PlayerInstance to inform
 		broadcastStatusUpdate();
 		

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -921,6 +921,27 @@ public class Attackable extends NpcInstance
 		}
 	}
 	
+	public Creature getMainDamageDealer()
+	{
+		if (_aggroList.isEmpty())
+		{
+			return null;
+		}
+		
+		int damage = 0;
+		Creature damageDealer = null;
+		for (AggroInfo info : _aggroList.values())
+		{
+			if ((info != null) && (info._damage > damage) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, this, info._attacker, true))
+			{
+				damage = info._damage;
+				damageDealer = info._attacker;
+			}
+		}
+		
+		return damageDealer;
+	}
+	
 	/**
 	 * Add damage and hate to the attacker AggroInfo of the Attackable _aggroList.
 	 * @param attacker The Creature that gave damages to this Attackable

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1817,6 +1817,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
 			
 			setKilledAlready(true);
 		}
+		
+		// Calculate rewards for main damage dealer.
+		final Creature mainDamageDealer = isMonster() ? ((MonsterInstance) this).getMainDamageDealer() : null;
+		calculateRewards(mainDamageDealer != null ? mainDamageDealer : killer);
+		
 		// Set target to null and cancel Attack or Cast
 		setTarget(null);
 		
@@ -1885,28 +1890,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
 				stopAllEffects();
 			}
 		}
-		else
+		else // this means all other characters, including Summons
-		// this means all other characters, including Summons
 		{
 			stopAllEffects();
 		}
 		
-		// if killer is the same then the most damager/hated
-		Creature mostHated = null;
-		if (this instanceof Attackable)
-		{
-			mostHated = ((Attackable) this)._mostHated;
-		}
-		
-		if ((mostHated != null) && isInsideRadius2D(mostHated, 200))
-		{
-			calculateRewards(mostHated);
-		}
-		else
-		{
-			calculateRewards(killer);
-		}
-		
 		// Send the Server->Client packet StatusUpdate with current HP and MP to all other PlayerInstance to inform
 		broadcastStatusUpdate();
 		

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -679,6 +679,27 @@ public class Attackable extends Npc
 		getAttackByList().add(creature);
 	}
 	
+	public Creature getMainDamageDealer()
+	{
+		if (_aggroList.isEmpty())
+		{
+			return null;
+		}
+		
+		int damage = 0;
+		Creature damageDealer = null;
+		for (AggroInfo info : _aggroList.values())
+		{
+			if ((info != null) && (info.getDamage() > damage) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, this, info.getAttacker(), true))
+			{
+				damage = info.getDamage();
+				damageDealer = info.getAttacker();
+			}
+		}
+		
+		return damageDealer;
+	}
+	
 	/**
 	 * Add damage and hate to the attacker AggroInfo of the Attackable _aggroList.
 	 * @param attacker The Creature that gave damages to this Attackable

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -73,6 +73,7 @@ import org.l2jmobius.gameserver.model.TimeStamp;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.WorldRegion;
+import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.actor.instance.QuestGuardInstance;
@@ -2432,6 +2433,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			setDead(true);
 		}
 		
+		// Calculate rewards for main damage dealer.
+		final Creature mainDamageDealer = isMonster() ? ((MonsterInstance) this).getMainDamageDealer() : null;
+		calculateRewards(mainDamageDealer != null ? mainDamageDealer : killer);
+		
 		// Set target to null and cancel Attack or Cast
 		setTarget(null);
 		
@@ -2458,8 +2463,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			stopAllEffectsExceptThoseThatLastThroughDeath();
 		}
 		
-		calculateRewards(killer);
-		
 		// Send the Server->Client packet StatusUpdate with current HP and MP to all other PlayerInstance to inform
 		broadcastStatusUpdate();
 		

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -679,6 +679,27 @@ public class Attackable extends Npc
 		getAttackByList().add(creature);
 	}
 	
+	public Creature getMainDamageDealer()
+	{
+		if (_aggroList.isEmpty())
+		{
+			return null;
+		}
+		
+		int damage = 0;
+		Creature damageDealer = null;
+		for (AggroInfo info : _aggroList.values())
+		{
+			if ((info != null) && (info.getDamage() > damage) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, this, info.getAttacker(), true))
+			{
+				damage = info.getDamage();
+				damageDealer = info.getAttacker();
+			}
+		}
+		
+		return damageDealer;
+	}
+	
 	/**
 	 * Add damage and hate to the attacker AggroInfo of the Attackable _aggroList.
 	 * @param attacker The Creature that gave damages to this Attackable

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -73,6 +73,7 @@ import org.l2jmobius.gameserver.model.TimeStamp;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.WorldRegion;
+import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.actor.instance.QuestGuardInstance;
@@ -2434,6 +2435,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			setDead(true);
 		}
 		
+		// Calculate rewards for main damage dealer.
+		final Creature mainDamageDealer = isMonster() ? ((MonsterInstance) this).getMainDamageDealer() : null;
+		calculateRewards(mainDamageDealer != null ? mainDamageDealer : killer);
+		
 		// Set target to null and cancel Attack or Cast
 		setTarget(null);
 		
@@ -2460,8 +2465,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			stopAllEffectsExceptThoseThatLastThroughDeath();
 		}
 		
-		calculateRewards(killer);
-		
 		// Send the Server->Client packet StatusUpdate with current HP and MP to all other PlayerInstance to inform
 		broadcastStatusUpdate();
 		

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -722,6 +722,27 @@ public class Attackable extends Npc
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
+	public Creature getMainDamageDealer()
+	{
+		if (_aggroList.isEmpty())
+		{
+			return null;
+		}
+		
+		int damage = 0;
+		Creature damageDealer = null;
+		for (AggroInfo info : _aggroList.values())
+		{
+			if ((info != null) && (info.getDamage() > damage) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, this, info.getAttacker(), true))
+			{
+				damage = info.getDamage();
+				damageDealer = info.getAttacker();
+			}
+		}
+		
+		return damageDealer;
+	}
+	
 	/**
 	 * Add damage and hate to the attacker AggroInfo of the Attackable _aggroList.
 	 * @param attacker The Creature that gave damages to this Attackable

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1692,7 +1692,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		abortAttack();
 		abortCast();
 		
-		calculateRewards(killer);
+		// Calculate rewards for main damage dealer.
+		final Creature mainDamageDealer = isMonster() ? ((MonsterInstance) this).getMainDamageDealer() : null;
+		calculateRewards(mainDamageDealer != null ? mainDamageDealer : killer);
 		
 		// Set target to null and cancel Attack or Cast
 		setTarget(null);

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -722,6 +722,27 @@ public class Attackable extends Npc
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
+	public Creature getMainDamageDealer()
+	{
+		if (_aggroList.isEmpty())
+		{
+			return null;
+		}
+		
+		int damage = 0;
+		Creature damageDealer = null;
+		for (AggroInfo info : _aggroList.values())
+		{
+			if ((info != null) && (info.getDamage() > damage) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, this, info.getAttacker(), true))
+			{
+				damage = info.getDamage();
+				damageDealer = info.getAttacker();
+			}
+		}
+		
+		return damageDealer;
+	}
+	
 	/**
 	 * Add damage and hate to the attacker AggroInfo of the Attackable _aggroList.
 	 * @param attacker The Creature that gave damages to this Attackable

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1692,7 +1692,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		abortAttack();
 		abortCast();
 		
-		calculateRewards(killer);
+		// Calculate rewards for main damage dealer.
+		final Creature mainDamageDealer = isMonster() ? ((MonsterInstance) this).getMainDamageDealer() : null;
+		calculateRewards(mainDamageDealer != null ? mainDamageDealer : killer);
 		
 		// Set target to null and cancel Attack or Cast
 		setTarget(null);

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -722,6 +722,27 @@ public class Attackable extends Npc
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
+	public Creature getMainDamageDealer()
+	{
+		if (_aggroList.isEmpty())
+		{
+			return null;
+		}
+		
+		int damage = 0;
+		Creature damageDealer = null;
+		for (AggroInfo info : _aggroList.values())
+		{
+			if ((info != null) && (info.getDamage() > damage) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, this, info.getAttacker(), true))
+			{
+				damage = info.getDamage();
+				damageDealer = info.getAttacker();
+			}
+		}
+		
+		return damageDealer;
+	}
+	
 	/**
 	 * Add damage and hate to the attacker AggroInfo of the Attackable _aggroList.
 	 * @param attacker The Creature that gave damages to this Attackable

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1692,7 +1692,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		abortAttack();
 		abortCast();
 		
-		calculateRewards(killer);
+		// Calculate rewards for main damage dealer.
+		final Creature mainDamageDealer = isMonster() ? ((MonsterInstance) this).getMainDamageDealer() : null;
+		calculateRewards(mainDamageDealer != null ? mainDamageDealer : killer);
 		
 		// Set target to null and cancel Attack or Cast
 		setTarget(null);

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -743,6 +743,27 @@ public class Attackable extends Npc
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
+	public Creature getMainDamageDealer()
+	{
+		if (_aggroList.isEmpty())
+		{
+			return null;
+		}
+		
+		int damage = 0;
+		Creature damageDealer = null;
+		for (AggroInfo info : _aggroList.values())
+		{
+			if ((info != null) && (info.getDamage() > damage) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, this, info.getAttacker(), true))
+			{
+				damage = info.getDamage();
+				damageDealer = info.getAttacker();
+			}
+		}
+		
+		return damageDealer;
+	}
+	
 	/**
 	 * Add damage and hate to the attacker AggroInfo of the Attackable _aggroList.
 	 * @param attacker The Creature that gave damages to this Attackable

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1693,7 +1693,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		abortAttack();
 		abortCast();
 		
-		calculateRewards(killer);
+		// Calculate rewards for main damage dealer.
+		final Creature mainDamageDealer = isMonster() ? ((MonsterInstance) this).getMainDamageDealer() : null;
+		calculateRewards(mainDamageDealer != null ? mainDamageDealer : killer);
 		
 		// Set target to null and cancel Attack or Cast
 		setTarget(null);

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -743,6 +743,27 @@ public class Attackable extends Npc
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
+	public Creature getMainDamageDealer()
+	{
+		if (_aggroList.isEmpty())
+		{
+			return null;
+		}
+		
+		int damage = 0;
+		Creature damageDealer = null;
+		for (AggroInfo info : _aggroList.values())
+		{
+			if ((info != null) && (info.getDamage() > damage) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, this, info.getAttacker(), true))
+			{
+				damage = info.getDamage();
+				damageDealer = info.getAttacker();
+			}
+		}
+		
+		return damageDealer;
+	}
+	
 	/**
 	 * Add damage and hate to the attacker AggroInfo of the Attackable _aggroList.
 	 * @param attacker The Creature that gave damages to this Attackable

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1693,7 +1693,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		abortAttack();
 		abortCast();
 		
-		calculateRewards(killer);
+		// Calculate rewards for main damage dealer.
+		final Creature mainDamageDealer = isMonster() ? ((MonsterInstance) this).getMainDamageDealer() : null;
+		calculateRewards(mainDamageDealer != null ? mainDamageDealer : killer);
 		
 		// Set target to null and cancel Attack or Cast
 		setTarget(null);

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -743,6 +743,27 @@ public class Attackable extends Npc
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
+	public Creature getMainDamageDealer()
+	{
+		if (_aggroList.isEmpty())
+		{
+			return null;
+		}
+		
+		int damage = 0;
+		Creature damageDealer = null;
+		for (AggroInfo info : _aggroList.values())
+		{
+			if ((info != null) && (info.getDamage() > damage) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, this, info.getAttacker(), true))
+			{
+				damage = info.getDamage();
+				damageDealer = info.getAttacker();
+			}
+		}
+		
+		return damageDealer;
+	}
+	
 	/**
 	 * Add damage and hate to the attacker AggroInfo of the Attackable _aggroList.
 	 * @param attacker The Creature that gave damages to this Attackable

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1693,7 +1693,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		abortAttack();
 		abortCast();
 		
-		calculateRewards(killer);
+		// Calculate rewards for main damage dealer.
+		final Creature mainDamageDealer = isMonster() ? ((MonsterInstance) this).getMainDamageDealer() : null;
+		calculateRewards(mainDamageDealer != null ? mainDamageDealer : killer);
 		
 		// Set target to null and cancel Attack or Cast
 		setTarget(null);

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -726,6 +726,27 @@ public class Attackable extends Npc
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
+	public Creature getMainDamageDealer()
+	{
+		if (_aggroList.isEmpty())
+		{
+			return null;
+		}
+		
+		int damage = 0;
+		Creature damageDealer = null;
+		for (AggroInfo info : _aggroList.values())
+		{
+			if ((info != null) && (info.getDamage() > damage) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, this, info.getAttacker(), true))
+			{
+				damage = info.getDamage();
+				damageDealer = info.getAttacker();
+			}
+		}
+		
+		return damageDealer;
+	}
+	
 	/**
 	 * Add damage and hate to the attacker AggroInfo of the Attackable _aggroList.
 	 * @param attacker The Creature that gave damages to this Attackable

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1692,7 +1692,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		abortAttack();
 		abortCast();
 		
-		calculateRewards(killer);
+		// Calculate rewards for main damage dealer.
+		final Creature mainDamageDealer = isMonster() ? ((MonsterInstance) this).getMainDamageDealer() : null;
+		calculateRewards(mainDamageDealer != null ? mainDamageDealer : killer);
 		
 		// Set target to null and cancel Attack or Cast
 		setTarget(null);

L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -748,6 +748,27 @@ public class Attackable extends Npc
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
+	public Creature getMainDamageDealer()
+	{
+		if (_aggroList.isEmpty())
+		{
+			return null;
+		}
+		
+		int damage = 0;
+		Creature damageDealer = null;
+		for (AggroInfo info : _aggroList.values())
+		{
+			if ((info != null) && (info.getDamage() > damage) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, this, info.getAttacker(), true))
+			{
+				damage = info.getDamage();
+				damageDealer = info.getAttacker();
+			}
+		}
+		
+		return damageDealer;
+	}
+	
 	/**
 	 * Add damage and hate to the attacker AggroInfo of the Attackable _aggroList.
 	 * @param attacker The Creature that gave damages to this Attackable

L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1696,7 +1696,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		abortAttack();
 		abortCast();
 		
-		calculateRewards(killer);
+		// Calculate rewards for main damage dealer.
+		final Creature mainDamageDealer = isMonster() ? ((MonsterInstance) this).getMainDamageDealer() : null;
+		calculateRewards(mainDamageDealer != null ? mainDamageDealer : killer);
 		
 		// Set target to null and cancel Attack or Cast
 		setTarget(null);

L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -753,6 +753,27 @@ public class Attackable extends Npc
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
+	public Creature getMainDamageDealer()
+	{
+		if (_aggroList.isEmpty())
+		{
+			return null;
+		}
+		
+		int damage = 0;
+		Creature damageDealer = null;
+		for (AggroInfo info : _aggroList.values())
+		{
+			if ((info != null) && (info.getDamage() > damage) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, this, info.getAttacker(), true))
+			{
+				damage = info.getDamage();
+				damageDealer = info.getAttacker();
+			}
+		}
+		
+		return damageDealer;
+	}
+	
 	/**
 	 * Add damage and hate to the attacker AggroInfo of the Attackable _aggroList.
 	 * @param attacker The Creature that gave damages to this Attackable

L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1703,7 +1703,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		abortAttack();
 		abortCast();
 		
-		calculateRewards(killer);
+		// Calculate rewards for main damage dealer.
+		final Creature mainDamageDealer = isMonster() ? ((MonsterInstance) this).getMainDamageDealer() : null;
+		calculateRewards(mainDamageDealer != null ? mainDamageDealer : killer);
 		
 		// Set target to null and cancel Attack or Cast
 		setTarget(null);