From e8ffbc41d26ddb590067b462d0443c42af052f27 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 16 Mar 2022 22:13:58 +0000
Subject: [PATCH] Replace lower level when a new skill is available.
 Contributed by nasseka.

---
 .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java    | 2 +-
 .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java    | 2 +-
 .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java    | 2 +-
 .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java    | 2 +-
 .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java    | 2 +-
 .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java    | 2 +-
 .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java    | 2 +-
 .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java    | 2 +-
 .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java    | 2 +-
 .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 0bfe57daba..8d78b021a8 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -335,7 +335,7 @@ public class AutoUseTaskManager implements Runnable
 		}
 		
 		final BuffInfo buffInfo = playableTarget.getEffectList().getBuffInfoBySkillId(skill.getId());
-		return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME);
+		return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel());
 	}
 	
 	private boolean canUseMagic(Player player, WorldObject target, Skill skill)
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 0bfe57daba..8d78b021a8 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -335,7 +335,7 @@ public class AutoUseTaskManager implements Runnable
 		}
 		
 		final BuffInfo buffInfo = playableTarget.getEffectList().getBuffInfoBySkillId(skill.getId());
-		return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME);
+		return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel());
 	}
 	
 	private boolean canUseMagic(Player player, WorldObject target, Skill skill)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 0bfe57daba..8d78b021a8 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -335,7 +335,7 @@ public class AutoUseTaskManager implements Runnable
 		}
 		
 		final BuffInfo buffInfo = playableTarget.getEffectList().getBuffInfoBySkillId(skill.getId());
-		return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME);
+		return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel());
 	}
 	
 	private boolean canUseMagic(Player player, WorldObject target, Skill skill)
diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 0bfe57daba..8d78b021a8 100644
--- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -335,7 +335,7 @@ public class AutoUseTaskManager implements Runnable
 		}
 		
 		final BuffInfo buffInfo = playableTarget.getEffectList().getBuffInfoBySkillId(skill.getId());
-		return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME);
+		return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel());
 	}
 	
 	private boolean canUseMagic(Player player, WorldObject target, Skill skill)
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 0bfe57daba..8d78b021a8 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -335,7 +335,7 @@ public class AutoUseTaskManager implements Runnable
 		}
 		
 		final BuffInfo buffInfo = playableTarget.getEffectList().getBuffInfoBySkillId(skill.getId());
-		return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME);
+		return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel());
 	}
 	
 	private boolean canUseMagic(Player player, WorldObject target, Skill skill)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 0bfe57daba..8d78b021a8 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -335,7 +335,7 @@ public class AutoUseTaskManager implements Runnable
 		}
 		
 		final BuffInfo buffInfo = playableTarget.getEffectList().getBuffInfoBySkillId(skill.getId());
-		return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME);
+		return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel());
 	}
 	
 	private boolean canUseMagic(Player player, WorldObject target, Skill skill)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 0bfe57daba..8d78b021a8 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -335,7 +335,7 @@ public class AutoUseTaskManager implements Runnable
 		}
 		
 		final BuffInfo buffInfo = playableTarget.getEffectList().getBuffInfoBySkillId(skill.getId());
-		return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME);
+		return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel());
 	}
 	
 	private boolean canUseMagic(Player player, WorldObject target, Skill skill)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 0bfe57daba..8d78b021a8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -335,7 +335,7 @@ public class AutoUseTaskManager implements Runnable
 		}
 		
 		final BuffInfo buffInfo = playableTarget.getEffectList().getBuffInfoBySkillId(skill.getId());
-		return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME);
+		return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel());
 	}
 	
 	private boolean canUseMagic(Player player, WorldObject target, Skill skill)
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 0bfe57daba..8d78b021a8 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -335,7 +335,7 @@ public class AutoUseTaskManager implements Runnable
 		}
 		
 		final BuffInfo buffInfo = playableTarget.getEffectList().getBuffInfoBySkillId(skill.getId());
-		return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME);
+		return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel());
 	}
 	
 	private boolean canUseMagic(Player player, WorldObject target, Skill skill)
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 0bfe57daba..8d78b021a8 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -335,7 +335,7 @@ public class AutoUseTaskManager implements Runnable
 		}
 		
 		final BuffInfo buffInfo = playableTarget.getEffectList().getBuffInfoBySkillId(skill.getId());
-		return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME);
+		return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel());
 	}
 	
 	private boolean canUseMagic(Player player, WorldObject target, Skill skill)