From 47ce8c29fb5a7725cbff07f53366d14fc5f858d6 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 14 Jul 2021 13:12:49 +0000
Subject: [PATCH] Fixed VitalityConsumeByBoss configuration. Contributed by
 nasseka.

---
 .../java/org/l2jmobius/gameserver/model/actor/Attackable.java  | 2 +-
 .../java/org/l2jmobius/gameserver/model/actor/Attackable.java  | 2 +-
 .../java/org/l2jmobius/gameserver/model/actor/Attackable.java  | 2 +-
 .../java/org/l2jmobius/gameserver/model/actor/Attackable.java  | 2 +-
 .../java/org/l2jmobius/gameserver/model/actor/Attackable.java  | 2 +-
 .../java/org/l2jmobius/gameserver/model/actor/Attackable.java  | 2 +-
 .../java/org/l2jmobius/gameserver/model/actor/Attackable.java  | 2 +-
 .../java/org/l2jmobius/gameserver/model/actor/Attackable.java  | 2 +-
 .../java/org/l2jmobius/gameserver/model/actor/Attackable.java  | 2 +-
 .../java/org/l2jmobius/gameserver/model/actor/Attackable.java  | 2 +-
 .../java/org/l2jmobius/gameserver/model/actor/Attackable.java  | 2 +-
 .../java/org/l2jmobius/gameserver/model/actor/Attackable.java  | 2 +-
 .../java/org/l2jmobius/gameserver/model/actor/Attackable.java  | 2 +-
 .../java/org/l2jmobius/gameserver/model/actor/Attackable.java  | 2 +-
 .../java/org/l2jmobius/gameserver/model/actor/Attackable.java  | 2 +-
 .../java/org/l2jmobius/gameserver/model/actor/Attackable.java  | 2 +-
 .../java/org/l2jmobius/gameserver/model/actor/Attackable.java  | 2 +-
 .../java/org/l2jmobius/gameserver/model/actor/Attackable.java  | 2 +-
 .../java/org/l2jmobius/gameserver/model/actor/Attackable.java  | 3 +--
 .../java/org/l2jmobius/gameserver/model/actor/Attackable.java  | 3 +--
 .../java/org/l2jmobius/gameserver/model/actor/Attackable.java  | 3 +--
 21 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index 1079fcef12..b2ca418a81 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -1797,7 +1797,7 @@ public class Attackable extends Npc
 	 */
 	public int getVitalityPoints(int level, double exp, boolean isBoss)
 	{
-		if ((getLevel() <= 0) || (getExpReward() <= 0))
+		if ((getLevel() <= 0) || (getExpReward() <= 0) || (isBoss && (Config.VITALITY_CONSUME_BY_BOSS == 0)))
 		{
 			return 0;
 		}
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index 54254930a5..5f709664e1 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -1738,7 +1738,7 @@ public class Attackable extends Npc
 	 */
 	public int getVitalityPoints(int level, double exp, boolean isBoss)
 	{
-		if ((getLevel() <= 0) || (getExpReward() <= 0))
+		if ((getLevel() <= 0) || (getExpReward() <= 0) || (isBoss && (Config.VITALITY_CONSUME_BY_BOSS == 0)))
 		{
 			return 0;
 		}
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index 54254930a5..5f709664e1 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -1738,7 +1738,7 @@ public class Attackable extends Npc
 	 */
 	public int getVitalityPoints(int level, double exp, boolean isBoss)
 	{
-		if ((getLevel() <= 0) || (getExpReward() <= 0))
+		if ((getLevel() <= 0) || (getExpReward() <= 0) || (isBoss && (Config.VITALITY_CONSUME_BY_BOSS == 0)))
 		{
 			return 0;
 		}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index 54254930a5..5f709664e1 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -1738,7 +1738,7 @@ public class Attackable extends Npc
 	 */
 	public int getVitalityPoints(int level, double exp, boolean isBoss)
 	{
-		if ((getLevel() <= 0) || (getExpReward() <= 0))
+		if ((getLevel() <= 0) || (getExpReward() <= 0) || (isBoss && (Config.VITALITY_CONSUME_BY_BOSS == 0)))
 		{
 			return 0;
 		}
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index 3612c1ce7e..d5201667ab 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -1724,7 +1724,7 @@ public class Attackable extends Npc
 	 */
 	public int getVitalityPoints(int level, double exp, boolean isBoss)
 	{
-		if ((getLevel() <= 0) || (getExpReward() <= 0))
+		if ((getLevel() <= 0) || (getExpReward() <= 0) || (isBoss && (Config.VITALITY_CONSUME_BY_BOSS == 0)))
 		{
 			return 0;
 		}
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index 3612c1ce7e..d5201667ab 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -1724,7 +1724,7 @@ public class Attackable extends Npc
 	 */
 	public int getVitalityPoints(int level, double exp, boolean isBoss)
 	{
-		if ((getLevel() <= 0) || (getExpReward() <= 0))
+		if ((getLevel() <= 0) || (getExpReward() <= 0) || (isBoss && (Config.VITALITY_CONSUME_BY_BOSS == 0)))
 		{
 			return 0;
 		}
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index 3612c1ce7e..d5201667ab 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -1724,7 +1724,7 @@ public class Attackable extends Npc
 	 */
 	public int getVitalityPoints(int level, double exp, boolean isBoss)
 	{
-		if ((getLevel() <= 0) || (getExpReward() <= 0))
+		if ((getLevel() <= 0) || (getExpReward() <= 0) || (isBoss && (Config.VITALITY_CONSUME_BY_BOSS == 0)))
 		{
 			return 0;
 		}
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index fc58442fb2..e3f1ee2812 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -1735,7 +1735,7 @@ public class Attackable extends Npc
 	 */
 	public int getVitalityPoints(int level, double exp, boolean isBoss)
 	{
-		if ((getLevel() <= 0) || (getExpReward() <= 0))
+		if ((getLevel() <= 0) || (getExpReward() <= 0) || (isBoss && (Config.VITALITY_CONSUME_BY_BOSS == 0)))
 		{
 			return 0;
 		}
diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index fc58442fb2..e3f1ee2812 100644
--- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -1735,7 +1735,7 @@ public class Attackable extends Npc
 	 */
 	public int getVitalityPoints(int level, double exp, boolean isBoss)
 	{
-		if ((getLevel() <= 0) || (getExpReward() <= 0))
+		if ((getLevel() <= 0) || (getExpReward() <= 0) || (isBoss && (Config.VITALITY_CONSUME_BY_BOSS == 0)))
 		{
 			return 0;
 		}
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index fc58442fb2..e3f1ee2812 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -1735,7 +1735,7 @@ public class Attackable extends Npc
 	 */
 	public int getVitalityPoints(int level, double exp, boolean isBoss)
 	{
-		if ((getLevel() <= 0) || (getExpReward() <= 0))
+		if ((getLevel() <= 0) || (getExpReward() <= 0) || (isBoss && (Config.VITALITY_CONSUME_BY_BOSS == 0)))
 		{
 			return 0;
 		}
diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index fc58442fb2..e3f1ee2812 100644
--- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -1735,7 +1735,7 @@ public class Attackable extends Npc
 	 */
 	public int getVitalityPoints(int level, double exp, boolean isBoss)
 	{
-		if ((getLevel() <= 0) || (getExpReward() <= 0))
+		if ((getLevel() <= 0) || (getExpReward() <= 0) || (isBoss && (Config.VITALITY_CONSUME_BY_BOSS == 0)))
 		{
 			return 0;
 		}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index 2a20807932..c3900e3149 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -1730,7 +1730,7 @@ public class Attackable extends Npc
 	 */
 	public int getVitalityPoints(int level, double exp, boolean isBoss)
 	{
-		if ((getLevel() <= 0) || (getExpReward() <= 0))
+		if ((getLevel() <= 0) || (getExpReward() <= 0) || (isBoss && (Config.VITALITY_CONSUME_BY_BOSS == 0)))
 		{
 			return 0;
 		}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index 2a20807932..c3900e3149 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -1730,7 +1730,7 @@ public class Attackable extends Npc
 	 */
 	public int getVitalityPoints(int level, double exp, boolean isBoss)
 	{
-		if ((getLevel() <= 0) || (getExpReward() <= 0))
+		if ((getLevel() <= 0) || (getExpReward() <= 0) || (isBoss && (Config.VITALITY_CONSUME_BY_BOSS == 0)))
 		{
 			return 0;
 		}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index 2a20807932..c3900e3149 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -1730,7 +1730,7 @@ public class Attackable extends Npc
 	 */
 	public int getVitalityPoints(int level, double exp, boolean isBoss)
 	{
-		if ((getLevel() <= 0) || (getExpReward() <= 0))
+		if ((getLevel() <= 0) || (getExpReward() <= 0) || (isBoss && (Config.VITALITY_CONSUME_BY_BOSS == 0)))
 		{
 			return 0;
 		}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index fce325aae2..bfdc22d226 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -1751,7 +1751,7 @@ public class Attackable extends Npc
 	 */
 	public int getVitalityPoints(int level, double exp, boolean isBoss)
 	{
-		if ((getLevel() <= 0) || (getExpReward() <= 0))
+		if ((getLevel() <= 0) || (getExpReward() <= 0) || (isBoss && (Config.VITALITY_CONSUME_BY_BOSS == 0)))
 		{
 			return 0;
 		}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index fce325aae2..bfdc22d226 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -1751,7 +1751,7 @@ public class Attackable extends Npc
 	 */
 	public int getVitalityPoints(int level, double exp, boolean isBoss)
 	{
-		if ((getLevel() <= 0) || (getExpReward() <= 0))
+		if ((getLevel() <= 0) || (getExpReward() <= 0) || (isBoss && (Config.VITALITY_CONSUME_BY_BOSS == 0)))
 		{
 			return 0;
 		}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index fce325aae2..bfdc22d226 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -1751,7 +1751,7 @@ public class Attackable extends Npc
 	 */
 	public int getVitalityPoints(int level, double exp, boolean isBoss)
 	{
-		if ((getLevel() <= 0) || (getExpReward() <= 0))
+		if ((getLevel() <= 0) || (getExpReward() <= 0) || (isBoss && (Config.VITALITY_CONSUME_BY_BOSS == 0)))
 		{
 			return 0;
 		}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index de08d94459..fc47b54b5c 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -1784,7 +1784,7 @@ public class Attackable extends Npc
 	 */
 	public int getVitalityPoints(int level, double exp, boolean isBoss)
 	{
-		if ((getLevel() <= 0) || (getExpReward() <= 0))
+		if ((getLevel() <= 0) || (getExpReward() <= 0) || (isBoss && (Config.VITALITY_CONSUME_BY_BOSS == 0)))
 		{
 			return 0;
 		}
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index 2ee043355a..52175aaea1 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -1756,13 +1756,12 @@ public class Attackable extends Npc
 	 */
 	public int getVitalityPoints(int level, double exp, boolean isBoss)
 	{
-		if ((getLevel() <= 0) || (getExpReward() <= 0))
+		if ((getLevel() <= 0) || (getExpReward() <= 0) || (isBoss && (Config.VITALITY_CONSUME_BY_BOSS == 0)))
 		{
 			return 0;
 		}
 		
 		final int points = Math.max((int) ((exp / (isBoss ? Config.VITALITY_CONSUME_BY_BOSS : Config.VITALITY_CONSUME_BY_MOB)) * Math.max(level - getLevel(), 1)), level < 40 ? 5 : 100);
-		
 		return -points;
 	}
 	
diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index 9e1730eed8..0f20c0473b 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -1761,13 +1761,12 @@ public class Attackable extends Npc
 	 */
 	public int getVitalityPoints(int level, double exp, boolean isBoss)
 	{
-		if ((getLevel() <= 0) || (getExpReward() <= 0))
+		if ((getLevel() <= 0) || (getExpReward() <= 0) || (isBoss && (Config.VITALITY_CONSUME_BY_BOSS == 0)))
 		{
 			return 0;
 		}
 		
 		final int points = Math.max((int) ((exp / (isBoss ? Config.VITALITY_CONSUME_BY_BOSS : Config.VITALITY_CONSUME_BY_MOB)) * Math.max(level - getLevel(), 1)), level < 40 ? 5 : 100);
-		
 		return -points;
 	}
 	
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index 9e1730eed8..0f20c0473b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -1761,13 +1761,12 @@ public class Attackable extends Npc
 	 */
 	public int getVitalityPoints(int level, double exp, boolean isBoss)
 	{
-		if ((getLevel() <= 0) || (getExpReward() <= 0))
+		if ((getLevel() <= 0) || (getExpReward() <= 0) || (isBoss && (Config.VITALITY_CONSUME_BY_BOSS == 0)))
 		{
 			return 0;
 		}
 		
 		final int points = Math.max((int) ((exp / (isBoss ? Config.VITALITY_CONSUME_BY_BOSS : Config.VITALITY_CONSUME_BY_MOB)) * Math.max(level - getLevel(), 1)), level < 40 ? 5 : 100);
-		
 		return -points;
 	}