From 49133f239f19ae3258ef389d14f443b9f2905ac9 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 12 Mar 2021 19:39:17 +0000
Subject: [PATCH] Fixed hero skills being given to subclasses. Contributed by
 Sahar.

---
 .../gameserver/model/actor/instance/PlayerInstance.java     | 6 +++---
 .../gameserver/model/actor/instance/PlayerInstance.java     | 6 +++---
 .../gameserver/model/actor/instance/PlayerInstance.java     | 6 +++---
 .../gameserver/model/actor/instance/PlayerInstance.java     | 6 +++---
 .../gameserver/model/actor/instance/PlayerInstance.java     | 6 +++---
 .../gameserver/model/actor/instance/PlayerInstance.java     | 6 +++---
 .../gameserver/model/actor/instance/PlayerInstance.java     | 6 +++---
 .../gameserver/model/actor/instance/PlayerInstance.java     | 6 +++---
 .../gameserver/model/actor/instance/PlayerInstance.java     | 6 +++---
 .../gameserver/model/actor/instance/PlayerInstance.java     | 6 +++---
 .../gameserver/model/actor/instance/PlayerInstance.java     | 6 +++---
 .../gameserver/model/actor/instance/PlayerInstance.java     | 6 +++---
 .../gameserver/model/actor/instance/PlayerInstance.java     | 6 +++---
 .../gameserver/model/actor/instance/PlayerInstance.java     | 6 +++---
 .../gameserver/model/actor/instance/PlayerInstance.java     | 6 +++---
 .../gameserver/model/actor/instance/PlayerInstance.java     | 6 +++---
 .../gameserver/model/actor/instance/PlayerInstance.java     | 6 +++---
 .../gameserver/model/actor/instance/PlayerInstance.java     | 6 +++---
 .../gameserver/model/actor/instance/PlayerInstance.java     | 6 +++---
 19 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 7f85fb7b85..b8ac1451e7 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -6541,9 +6541,6 @@ public class PlayerInstance extends Playable
 					player.setPledgeType(rset.getInt("subpledge"));
 					// player.setApprentice(rset.getInt("apprentice"));
 					
-					// Set Hero status if it applies.
-					player.setHero(Hero.getInstance().isHero(objectId));
-					
 					if (clanId > 0)
 					{
 						player.setClan(ClanTable.getInstance().getClan(clanId));
@@ -6634,6 +6631,9 @@ public class PlayerInstance extends Playable
 					player.setSponsor(rset.getInt("sponsor"));
 					player.setLvlJoinedAcademy(rset.getInt("lvl_joined_academy"));
 					
+					// Set Hero status if it applies.
+					player.setHero(Hero.getInstance().isHero(objectId));
+					
 					CursedWeaponsManager.getInstance().checkPlayer(player);
 					
 					// Set the x,y,z position of the PlayerInstance and make it invisible
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 8e4752f13f..d15db13500 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -6548,9 +6548,6 @@ public class PlayerInstance extends Playable
 					player.setPledgeType(rset.getInt("subpledge"));
 					// player.setApprentice(rset.getInt("apprentice"));
 					
-					// Set Hero status if it applies.
-					player.setHero(Hero.getInstance().isHero(objectId));
-					
 					if (clanId > 0)
 					{
 						player.setClan(ClanTable.getInstance().getClan(clanId));
@@ -6641,6 +6638,9 @@ public class PlayerInstance extends Playable
 					player.setSponsor(rset.getInt("sponsor"));
 					player.setLvlJoinedAcademy(rset.getInt("lvl_joined_academy"));
 					
+					// Set Hero status if it applies.
+					player.setHero(Hero.getInstance().isHero(objectId));
+					
 					CursedWeaponsManager.getInstance().checkPlayer(player);
 					
 					// Set the x,y,z position of the PlayerInstance and make it invisible
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 03109da6b0..5a681af727 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -6550,9 +6550,6 @@ public class PlayerInstance extends Playable
 					player.setPledgeType(rset.getInt("subpledge"));
 					// player.setApprentice(rset.getInt("apprentice"));
 					
-					// Set Hero status if it applies.
-					player.setHero(Hero.getInstance().isHero(objectId));
-					
 					if (clanId > 0)
 					{
 						player.setClan(ClanTable.getInstance().getClan(clanId));
@@ -6643,6 +6640,9 @@ public class PlayerInstance extends Playable
 					player.setSponsor(rset.getInt("sponsor"));
 					player.setLvlJoinedAcademy(rset.getInt("lvl_joined_academy"));
 					
+					// Set Hero status if it applies.
+					player.setHero(Hero.getInstance().isHero(objectId));
+					
 					CursedWeaponsManager.getInstance().checkPlayer(player);
 					
 					// Set the x,y,z position of the PlayerInstance and make it invisible
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 696397bd75..c63e3ae134 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -6545,9 +6545,6 @@ public class PlayerInstance extends Playable
 					player.setPledgeType(rset.getInt("subpledge"));
 					// player.setApprentice(rset.getInt("apprentice"));
 					
-					// Set Hero status if it applies.
-					player.setHero(Hero.getInstance().isHero(objectId));
-					
 					if (clanId > 0)
 					{
 						player.setClan(ClanTable.getInstance().getClan(clanId));
@@ -6638,6 +6635,9 @@ public class PlayerInstance extends Playable
 					player.setSponsor(rset.getInt("sponsor"));
 					player.setLvlJoinedAcademy(rset.getInt("lvl_joined_academy"));
 					
+					// Set Hero status if it applies.
+					player.setHero(Hero.getInstance().isHero(objectId));
+					
 					CursedWeaponsManager.getInstance().checkPlayer(player);
 					
 					// Set the x,y,z position of the PlayerInstance and make it invisible
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 3da0b4e6ef..7370fc7430 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -6525,9 +6525,6 @@ public class PlayerInstance extends Playable
 					player.setPledgeType(rset.getInt("subpledge"));
 					// player.setApprentice(rset.getInt("apprentice"));
 					
-					// Set Hero status if it applies.
-					player.setHero(Hero.getInstance().isHero(objectId));
-					
 					if (clanId > 0)
 					{
 						player.setClan(ClanTable.getInstance().getClan(clanId));
@@ -6618,6 +6615,9 @@ public class PlayerInstance extends Playable
 					player.setSponsor(rset.getInt("sponsor"));
 					player.setLvlJoinedAcademy(rset.getInt("lvl_joined_academy"));
 					
+					// Set Hero status if it applies.
+					player.setHero(Hero.getInstance().isHero(objectId));
+					
 					CursedWeaponsManager.getInstance().checkPlayer(player);
 					
 					// Set the x,y,z position of the PlayerInstance and make it invisible
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 4c6b1f0866..9d5ad51718 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -6525,9 +6525,6 @@ public class PlayerInstance extends Playable
 					player.setPledgeType(rset.getInt("subpledge"));
 					// player.setApprentice(rset.getInt("apprentice"));
 					
-					// Set Hero status if it applies.
-					player.setHero(Hero.getInstance().isHero(objectId));
-					
 					if (clanId > 0)
 					{
 						player.setClan(ClanTable.getInstance().getClan(clanId));
@@ -6618,6 +6615,9 @@ public class PlayerInstance extends Playable
 					player.setSponsor(rset.getInt("sponsor"));
 					player.setLvlJoinedAcademy(rset.getInt("lvl_joined_academy"));
 					
+					// Set Hero status if it applies.
+					player.setHero(Hero.getInstance().isHero(objectId));
+					
 					CursedWeaponsManager.getInstance().checkPlayer(player);
 					
 					// Set the x,y,z position of the PlayerInstance and make it invisible
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 97f49293c7..6ca2112120 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -6526,9 +6526,6 @@ public class PlayerInstance extends Playable
 					player.setPledgeType(rset.getInt("subpledge"));
 					// player.setApprentice(rset.getInt("apprentice"));
 					
-					// Set Hero status if it applies.
-					player.setHero(Hero.getInstance().isHero(objectId));
-					
 					if (clanId > 0)
 					{
 						player.setClan(ClanTable.getInstance().getClan(clanId));
@@ -6619,6 +6616,9 @@ public class PlayerInstance extends Playable
 					player.setSponsor(rset.getInt("sponsor"));
 					player.setLvlJoinedAcademy(rset.getInt("lvl_joined_academy"));
 					
+					// Set Hero status if it applies.
+					player.setHero(Hero.getInstance().isHero(objectId));
+					
 					CursedWeaponsManager.getInstance().checkPlayer(player);
 					
 					// Set the x,y,z position of the PlayerInstance and make it invisible
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 3df75c5c67..22d7987fc4 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -6483,9 +6483,6 @@ public class PlayerInstance extends Playable
 					player.setPledgeType(rset.getInt("subpledge"));
 					// player.setApprentice(rset.getInt("apprentice"));
 					
-					// Set Hero status if it applies.
-					player.setHero(Hero.getInstance().isHero(objectId));
-					
 					if (clanId > 0)
 					{
 						player.setClan(ClanTable.getInstance().getClan(clanId));
@@ -6576,6 +6573,9 @@ public class PlayerInstance extends Playable
 					player.setSponsor(rset.getInt("sponsor"));
 					player.setLvlJoinedAcademy(rset.getInt("lvl_joined_academy"));
 					
+					// Set Hero status if it applies.
+					player.setHero(Hero.getInstance().isHero(objectId));
+					
 					CursedWeaponsManager.getInstance().checkPlayer(player);
 					
 					// Set the x,y,z position of the PlayerInstance and make it invisible
diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 99da00bba4..f567cc9eb8 100644
--- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -6509,9 +6509,6 @@ public class PlayerInstance extends Playable
 					player.setPledgeType(rset.getInt("subpledge"));
 					// player.setApprentice(rset.getInt("apprentice"));
 					
-					// Set Hero status if it applies.
-					player.setHero(Hero.getInstance().isHero(objectId));
-					
 					if (clanId > 0)
 					{
 						player.setClan(ClanTable.getInstance().getClan(clanId));
@@ -6602,6 +6599,9 @@ public class PlayerInstance extends Playable
 					player.setSponsor(rset.getInt("sponsor"));
 					player.setLvlJoinedAcademy(rset.getInt("lvl_joined_academy"));
 					
+					// Set Hero status if it applies.
+					player.setHero(Hero.getInstance().isHero(objectId));
+					
 					CursedWeaponsManager.getInstance().checkPlayer(player);
 					
 					// Set the x,y,z position of the PlayerInstance and make it invisible
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 99da00bba4..f567cc9eb8 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -6509,9 +6509,6 @@ public class PlayerInstance extends Playable
 					player.setPledgeType(rset.getInt("subpledge"));
 					// player.setApprentice(rset.getInt("apprentice"));
 					
-					// Set Hero status if it applies.
-					player.setHero(Hero.getInstance().isHero(objectId));
-					
 					if (clanId > 0)
 					{
 						player.setClan(ClanTable.getInstance().getClan(clanId));
@@ -6602,6 +6599,9 @@ public class PlayerInstance extends Playable
 					player.setSponsor(rset.getInt("sponsor"));
 					player.setLvlJoinedAcademy(rset.getInt("lvl_joined_academy"));
 					
+					// Set Hero status if it applies.
+					player.setHero(Hero.getInstance().isHero(objectId));
+					
 					CursedWeaponsManager.getInstance().checkPlayer(player);
 					
 					// Set the x,y,z position of the PlayerInstance and make it invisible
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index ee5d9d0bd6..4e7e025cef 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -6497,9 +6497,6 @@ public class PlayerInstance extends Playable
 					player.setPledgeType(rset.getInt("subpledge"));
 					// player.setApprentice(rset.getInt("apprentice"));
 					
-					// Set Hero status if it applies.
-					player.setHero(Hero.getInstance().isHero(objectId));
-					
 					if (clanId > 0)
 					{
 						player.setClan(ClanTable.getInstance().getClan(clanId));
@@ -6590,6 +6587,9 @@ public class PlayerInstance extends Playable
 					player.setSponsor(rset.getInt("sponsor"));
 					player.setLvlJoinedAcademy(rset.getInt("lvl_joined_academy"));
 					
+					// Set Hero status if it applies.
+					player.setHero(Hero.getInstance().isHero(objectId));
+					
 					CursedWeaponsManager.getInstance().checkPlayer(player);
 					
 					// Set the x,y,z position of the PlayerInstance and make it invisible
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 281e682214..7520e0ac49 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -6497,9 +6497,6 @@ public class PlayerInstance extends Playable
 					player.setPledgeType(rset.getInt("subpledge"));
 					// player.setApprentice(rset.getInt("apprentice"));
 					
-					// Set Hero status if it applies.
-					player.setHero(Hero.getInstance().isHero(objectId));
-					
 					if (clanId > 0)
 					{
 						player.setClan(ClanTable.getInstance().getClan(clanId));
@@ -6590,6 +6587,9 @@ public class PlayerInstance extends Playable
 					player.setSponsor(rset.getInt("sponsor"));
 					player.setLvlJoinedAcademy(rset.getInt("lvl_joined_academy"));
 					
+					// Set Hero status if it applies.
+					player.setHero(Hero.getInstance().isHero(objectId));
+					
 					CursedWeaponsManager.getInstance().checkPlayer(player);
 					
 					// Set the x,y,z position of the PlayerInstance and make it invisible
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 1c9e8154b5..353445c799 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -6483,9 +6483,6 @@ public class PlayerInstance extends Playable
 					player.setPledgeType(rset.getInt("subpledge"));
 					// player.setApprentice(rset.getInt("apprentice"));
 					
-					// Set Hero status if it applies.
-					player.setHero(Hero.getInstance().isHero(objectId));
-					
 					if (clanId > 0)
 					{
 						player.setClan(ClanTable.getInstance().getClan(clanId));
@@ -6576,6 +6573,9 @@ public class PlayerInstance extends Playable
 					player.setSponsor(rset.getInt("sponsor"));
 					player.setLvlJoinedAcademy(rset.getInt("lvl_joined_academy"));
 					
+					// Set Hero status if it applies.
+					player.setHero(Hero.getInstance().isHero(objectId));
+					
 					CursedWeaponsManager.getInstance().checkPlayer(player);
 					
 					// Set the x,y,z position of the PlayerInstance and make it invisible
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index c0a8ab14e9..5ea9875ba3 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -6494,9 +6494,6 @@ public class PlayerInstance extends Playable
 					player.setPledgeType(rset.getInt("subpledge"));
 					// player.setApprentice(rset.getInt("apprentice"));
 					
-					// Set Hero status if it applies.
-					player.setHero(Hero.getInstance().isHero(objectId));
-					
 					if (clanId > 0)
 					{
 						player.setClan(ClanTable.getInstance().getClan(clanId));
@@ -6592,6 +6589,9 @@ public class PlayerInstance extends Playable
 						player.initElementalSpirits();
 					}
 					
+					// Set Hero status if it applies.
+					player.setHero(Hero.getInstance().isHero(objectId));
+					
 					CursedWeaponsManager.getInstance().checkPlayer(player);
 					
 					// Set the x,y,z position of the PlayerInstance and make it invisible
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index e577951ff0..e428c1b0b1 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -6494,9 +6494,6 @@ public class PlayerInstance extends Playable
 					player.setPledgeType(rset.getInt("subpledge"));
 					// player.setApprentice(rset.getInt("apprentice"));
 					
-					// Set Hero status if it applies.
-					player.setHero(Hero.getInstance().isHero(objectId));
-					
 					if (clanId > 0)
 					{
 						player.setClan(ClanTable.getInstance().getClan(clanId));
@@ -6592,6 +6589,9 @@ public class PlayerInstance extends Playable
 						player.initElementalSpirits();
 					}
 					
+					// Set Hero status if it applies.
+					player.setHero(Hero.getInstance().isHero(objectId));
+					
 					CursedWeaponsManager.getInstance().checkPlayer(player);
 					
 					// Set the x,y,z position of the PlayerInstance and make it invisible
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 859703b4b5..9107de6039 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -6440,9 +6440,6 @@ public class PlayerInstance extends Playable
 					player.setPledgeType(rset.getInt("subpledge"));
 					// player.setApprentice(rset.getInt("apprentice"));
 					
-					// Set Hero status if it applies.
-					player.setHero(Hero.getInstance().isHero(objectId));
-					
 					if (clanId > 0)
 					{
 						player.setClan(ClanTable.getInstance().getClan(clanId));
@@ -6538,6 +6535,9 @@ public class PlayerInstance extends Playable
 						player.initElementalSpirits();
 					}
 					
+					// Set Hero status if it applies.
+					player.setHero(Hero.getInstance().isHero(objectId));
+					
 					CursedWeaponsManager.getInstance().checkPlayer(player);
 					
 					// Set the x,y,z position of the PlayerInstance and make it invisible
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index df4030e345..fb6ba00c56 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -6499,9 +6499,6 @@ public class PlayerInstance extends Playable
 					player.setPledgeType(rset.getInt("subpledge"));
 					// player.setApprentice(rset.getInt("apprentice"));
 					
-					// Set Hero status if it applies.
-					player.setHero(Hero.getInstance().isHero(objectId));
-					
 					if (clanId > 0)
 					{
 						player.setClan(ClanTable.getInstance().getClan(clanId));
@@ -6592,6 +6589,9 @@ public class PlayerInstance extends Playable
 					player.setSponsor(rset.getInt("sponsor"));
 					player.setLvlJoinedAcademy(rset.getInt("lvl_joined_academy"));
 					
+					// Set Hero status if it applies.
+					player.setHero(Hero.getInstance().isHero(objectId));
+					
 					CursedWeaponsManager.getInstance().checkPlayer(player);
 					
 					// Set the x,y,z position of the PlayerInstance and make it invisible
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 4cc97f2bb9..058614dd0c 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -6508,9 +6508,6 @@ public class PlayerInstance extends Playable
 					player.setPledgeType(rset.getInt("subpledge"));
 					// player.setApprentice(rset.getInt("apprentice"));
 					
-					// Set Hero status if it applies.
-					player.setHero(Hero.getInstance().isHero(objectId));
-					
 					if (clanId > 0)
 					{
 						player.setClan(ClanTable.getInstance().getClan(clanId));
@@ -6610,6 +6607,9 @@ public class PlayerInstance extends Playable
 						player.initElementalSpirits();
 					}
 					
+					// Set Hero status if it applies.
+					player.setHero(Hero.getInstance().isHero(objectId));
+					
 					CursedWeaponsManager.getInstance().checkPlayer(player);
 					
 					// Set the x,y,z position of the PlayerInstance and make it invisible
diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 21f491bb13..6d630ad626 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -6512,9 +6512,6 @@ public class PlayerInstance extends Playable
 					player.setPledgeType(rset.getInt("subpledge"));
 					// player.setApprentice(rset.getInt("apprentice"));
 					
-					// Set Hero status if it applies.
-					player.setHero(Hero.getInstance().isHero(objectId));
-					
 					if (clanId > 0)
 					{
 						player.setClan(ClanTable.getInstance().getClan(clanId));
@@ -6614,6 +6611,9 @@ public class PlayerInstance extends Playable
 						player.initElementalSpirits();
 					}
 					
+					// Set Hero status if it applies.
+					player.setHero(Hero.getInstance().isHero(objectId));
+					
 					CursedWeaponsManager.getInstance().checkPlayer(player);
 					
 					// Set the x,y,z position of the PlayerInstance and make it invisible