Fixed hero skills being given to subclasses.

Contributed by Sahar.
This commit is contained in:
MobiusDevelopment 2021-03-12 19:39:17 +00:00
parent 602abf9886
commit 49133f239f
19 changed files with 57 additions and 57 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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