From 10632571b669078dcfb5918a4a6fabc63f99369d Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 20 Dec 2020 22:34:53 +0000
Subject: [PATCH] Fixed raidboss vitality consumption configuration.

---
 .../org/l2jmobius/gameserver/model/actor/Attackable.java   | 7 +++++--
 .../org/l2jmobius/gameserver/model/actor/Attackable.java   | 7 +++++--
 .../org/l2jmobius/gameserver/model/actor/Attackable.java   | 7 +++++--
 .../org/l2jmobius/gameserver/model/actor/Attackable.java   | 7 +++++--
 .../org/l2jmobius/gameserver/model/actor/Attackable.java   | 2 +-
 .../org/l2jmobius/gameserver/model/actor/Attackable.java   | 2 +-
 .../org/l2jmobius/gameserver/model/actor/Attackable.java   | 2 +-
 .../org/l2jmobius/gameserver/model/actor/Attackable.java   | 7 +++++--
 .../org/l2jmobius/gameserver/model/actor/Attackable.java   | 7 +++++--
 .../org/l2jmobius/gameserver/model/actor/Attackable.java   | 2 +-
 .../org/l2jmobius/gameserver/model/actor/Attackable.java   | 2 +-
 .../org/l2jmobius/gameserver/model/actor/Attackable.java   | 7 +++++--
 .../org/l2jmobius/gameserver/model/actor/Attackable.java   | 7 +++++--
 .../org/l2jmobius/gameserver/model/actor/Attackable.java   | 7 +++++--
 .../org/l2jmobius/gameserver/model/actor/Attackable.java   | 7 +++++--
 .../org/l2jmobius/gameserver/model/actor/Attackable.java   | 7 +++++--
 .../org/l2jmobius/gameserver/model/actor/Attackable.java   | 7 +++++--
 .../org/l2jmobius/gameserver/model/actor/Attackable.java   | 7 +++++--
 18 files changed, 70 insertions(+), 31 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 68e8fbefa8..b665780afe 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
@@ -528,8 +528,11 @@ public class Attackable extends Npc
 										}
 										clan.addHuntingPoints(attacker, this, finalExp);
 									}
-									attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, _isRaid), true, false);
-									PcCafePointsManager.getInstance().givePcCafePoint(attacker, exp);
+									if (useVitalityRate())
+									{
+										attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, _isRaid), true, false);
+										PcCafePointsManager.getInstance().givePcCafePoint(attacker, exp);
+									}
 								}
 							}
 						}
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 a52a2c2e21..244299501f 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
@@ -521,8 +521,11 @@ public class Attackable extends Npc
 										}
 										clan.addHuntingPoints(attacker, this, finalExp);
 									}
-									attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, _isRaid), true, false);
-									PcCafePointsManager.getInstance().givePcCafePoint(attacker, exp);
+									if (useVitalityRate())
+									{
+										attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, _isRaid), true, false);
+										PcCafePointsManager.getInstance().givePcCafePoint(attacker, exp);
+									}
 								}
 							}
 						}
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 a52a2c2e21..244299501f 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
@@ -521,8 +521,11 @@ public class Attackable extends Npc
 										}
 										clan.addHuntingPoints(attacker, this, finalExp);
 									}
-									attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, _isRaid), true, false);
-									PcCafePointsManager.getInstance().givePcCafePoint(attacker, exp);
+									if (useVitalityRate())
+									{
+										attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, _isRaid), true, false);
+										PcCafePointsManager.getInstance().givePcCafePoint(attacker, exp);
+									}
 								}
 							}
 						}
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 a52a2c2e21..244299501f 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
@@ -521,8 +521,11 @@ public class Attackable extends Npc
 										}
 										clan.addHuntingPoints(attacker, this, finalExp);
 									}
-									attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, _isRaid), true, false);
-									PcCafePointsManager.getInstance().givePcCafePoint(attacker, exp);
+									if (useVitalityRate())
+									{
+										attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, _isRaid), true, false);
+										PcCafePointsManager.getInstance().givePcCafePoint(attacker, exp);
+									}
 								}
 							}
 						}
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 9dcb7a3bca..92d783ce7c 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
@@ -508,7 +508,7 @@ public class Attackable extends Npc
 								exp = attacker.getStat().getValue(Stat.EXPSP_RATE, exp) * Config.EXP_AMOUNT_MULTIPLIERS[attacker.getClassId().getId()];
 								sp = attacker.getStat().getValue(Stat.EXPSP_RATE, sp) * Config.SP_AMOUNT_MULTIPLIERS[attacker.getClassId().getId()];
 								attacker.addExpAndSp(exp, sp, useVitalityRate());
-								if (exp > 0)
+								if ((exp > 0) && useVitalityRate())
 								{
 									attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, _isRaid), true, false);
 									PcCafePointsManager.getInstance().givePcCafePoint(attacker, exp);
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 9dcb7a3bca..92d783ce7c 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
@@ -508,7 +508,7 @@ public class Attackable extends Npc
 								exp = attacker.getStat().getValue(Stat.EXPSP_RATE, exp) * Config.EXP_AMOUNT_MULTIPLIERS[attacker.getClassId().getId()];
 								sp = attacker.getStat().getValue(Stat.EXPSP_RATE, sp) * Config.SP_AMOUNT_MULTIPLIERS[attacker.getClassId().getId()];
 								attacker.addExpAndSp(exp, sp, useVitalityRate());
-								if (exp > 0)
+								if ((exp > 0) && useVitalityRate())
 								{
 									attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, _isRaid), true, false);
 									PcCafePointsManager.getInstance().givePcCafePoint(attacker, exp);
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 9dcb7a3bca..92d783ce7c 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
@@ -508,7 +508,7 @@ public class Attackable extends Npc
 								exp = attacker.getStat().getValue(Stat.EXPSP_RATE, exp) * Config.EXP_AMOUNT_MULTIPLIERS[attacker.getClassId().getId()];
 								sp = attacker.getStat().getValue(Stat.EXPSP_RATE, sp) * Config.SP_AMOUNT_MULTIPLIERS[attacker.getClassId().getId()];
 								attacker.addExpAndSp(exp, sp, useVitalityRate());
-								if (exp > 0)
+								if ((exp > 0) && useVitalityRate())
 								{
 									attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, _isRaid), true, false);
 									PcCafePointsManager.getInstance().givePcCafePoint(attacker, exp);
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 7ea75a2f71..1ae854e835 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
@@ -510,8 +510,11 @@ public class Attackable extends Npc
 								attacker.addExpAndSp(exp, sp, useVitalityRate());
 								if (exp > 0)
 								{
-									attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, _isRaid), true, false);
-									PcCafePointsManager.getInstance().givePcCafePoint(attacker, exp);
+									if (useVitalityRate())
+									{
+										attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, _isRaid), true, false);
+										PcCafePointsManager.getInstance().givePcCafePoint(attacker, exp);
+									}
 									if (attacker.getSymbolSealPoints() > 0)
 									{
 										attacker.setSymbolSealPoints(attacker.getSymbolSealPoints() - Config.CONSUME_SYMBOL_SEAL_POINTS);
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 7ea75a2f71..1ae854e835 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
@@ -510,8 +510,11 @@ public class Attackable extends Npc
 								attacker.addExpAndSp(exp, sp, useVitalityRate());
 								if (exp > 0)
 								{
-									attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, _isRaid), true, false);
-									PcCafePointsManager.getInstance().givePcCafePoint(attacker, exp);
+									if (useVitalityRate())
+									{
+										attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, _isRaid), true, false);
+										PcCafePointsManager.getInstance().givePcCafePoint(attacker, exp);
+									}
 									if (attacker.getSymbolSealPoints() > 0)
 									{
 										attacker.setSymbolSealPoints(attacker.getSymbolSealPoints() - Config.CONSUME_SYMBOL_SEAL_POINTS);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index 64e7b54664..b6f12e2b29 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -476,7 +476,7 @@ public class Attackable extends Npc
 								final int addsp = (int) attacker.calcStat(Stat.EXPSP_RATE, sp, null, null);
 								
 								attacker.addExpAndSp(addexp, addsp, useVitalityRate());
-								if (addexp > 0)
+								if ((addexp > 0) && useVitalityRate())
 								{
 									attacker.updateVitalityPoints(getVitalityPoints(damage), true, false);
 								}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index 64e7b54664..b6f12e2b29 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -476,7 +476,7 @@ public class Attackable extends Npc
 								final int addsp = (int) attacker.calcStat(Stat.EXPSP_RATE, sp, null, null);
 								
 								attacker.addExpAndSp(addexp, addsp, useVitalityRate());
-								if (addexp > 0)
+								if ((addexp > 0) && useVitalityRate())
 								{
 									attacker.updateVitalityPoints(getVitalityPoints(damage), true, false);
 								}
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 15bb98376e..85f8677282 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
@@ -521,8 +521,11 @@ public class Attackable extends Npc
 										}
 										clan.addHuntingPoints(attacker, this, finalExp);
 									}
-									attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, _isRaid), true, false);
-									PcCafePointsManager.getInstance().givePcCafePoint(attacker, exp);
+									if (useVitalityRate())
+									{
+										attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, _isRaid), true, false);
+										PcCafePointsManager.getInstance().givePcCafePoint(attacker, exp);
+									}
 								}
 							}
 						}
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 15bb98376e..85f8677282 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
@@ -521,8 +521,11 @@ public class Attackable extends Npc
 										}
 										clan.addHuntingPoints(attacker, this, finalExp);
 									}
-									attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, _isRaid), true, false);
-									PcCafePointsManager.getInstance().givePcCafePoint(attacker, exp);
+									if (useVitalityRate())
+									{
+										attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, _isRaid), true, false);
+										PcCafePointsManager.getInstance().givePcCafePoint(attacker, exp);
+									}
 								}
 							}
 						}
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 15bb98376e..85f8677282 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
@@ -521,8 +521,11 @@ public class Attackable extends Npc
 										}
 										clan.addHuntingPoints(attacker, this, finalExp);
 									}
-									attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, _isRaid), true, false);
-									PcCafePointsManager.getInstance().givePcCafePoint(attacker, exp);
+									if (useVitalityRate())
+									{
+										attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, _isRaid), true, false);
+										PcCafePointsManager.getInstance().givePcCafePoint(attacker, exp);
+									}
 								}
 							}
 						}
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 f5fda32074..ce022114fa 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
@@ -523,8 +523,11 @@ public class Attackable extends Npc
 										}
 										clan.addHuntingPoints(attacker, this, finalExp);
 									}
-									attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, _isRaid), true, false);
-									PcCafePointsManager.getInstance().givePcCafePoint(attacker, exp);
+									if (useVitalityRate())
+									{
+										attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, _isRaid), true, false);
+										PcCafePointsManager.getInstance().givePcCafePoint(attacker, exp);
+									}
 								}
 								
 								rewardAttributeExp(attacker, damage, totalDamage);
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 f5fda32074..ce022114fa 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
@@ -523,8 +523,11 @@ public class Attackable extends Npc
 										}
 										clan.addHuntingPoints(attacker, this, finalExp);
 									}
-									attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, _isRaid), true, false);
-									PcCafePointsManager.getInstance().givePcCafePoint(attacker, exp);
+									if (useVitalityRate())
+									{
+										attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, _isRaid), true, false);
+										PcCafePointsManager.getInstance().givePcCafePoint(attacker, exp);
+									}
 								}
 								
 								rewardAttributeExp(attacker, damage, totalDamage);
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 f5fda32074..ce022114fa 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
@@ -523,8 +523,11 @@ public class Attackable extends Npc
 										}
 										clan.addHuntingPoints(attacker, this, finalExp);
 									}
-									attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, _isRaid), true, false);
-									PcCafePointsManager.getInstance().givePcCafePoint(attacker, exp);
+									if (useVitalityRate())
+									{
+										attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, _isRaid), true, false);
+										PcCafePointsManager.getInstance().givePcCafePoint(attacker, exp);
+									}
 								}
 								
 								rewardAttributeExp(attacker, damage, totalDamage);
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 5bcd050725..0263036abd 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
@@ -525,8 +525,11 @@ public class Attackable extends Npc
 										}
 										clan.addHuntingPoints(attacker, this, finalExp);
 									}
-									attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, _isRaid), true, false);
-									PcCafePointsManager.getInstance().givePcCafePoint(attacker, exp);
+									if (useVitalityRate())
+									{
+										attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, _isRaid), true, false);
+										PcCafePointsManager.getInstance().givePcCafePoint(attacker, exp);
+									}
 								}
 							}
 						}