diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java index 505a51ac27..19fcd59ca4 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java @@ -354,7 +354,8 @@ public class BaylorWarzone extends AbstractInstance { giveItems(member, BENUSTAS_REWARD_BOX); } - final Player randomPlayer = world.getFirstPlayer().getParty().getRandomPlayer(); + final Party party = world.getFirstPlayer().getParty(); + final Player randomPlayer = party != null ? party.getRandomPlayer() : null; if ((randomPlayer != null) && (getRandom(100) < 80) && (world.getPlayersCount() == world.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0))) { giveItems(randomPlayer, BENUSTAS_SHINING_REWARD_BOX); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java index 466e9910cf..dd5aaad843 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java @@ -337,7 +337,8 @@ public class AshenShadowRevolutionaries extends AbstractInstance { giveItems(member, BENUSTAS_REWARD_BOX); } - final Player randomPlayer = world.getFirstPlayer().getParty().getRandomPlayer(); + final Party party = world.getFirstPlayer().getParty(); + final Player randomPlayer = party != null ? party.getRandomPlayer() : null; if ((randomPlayer != null) && (getRandom(100) < 80) && (world.getPlayersCount() == world.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0))) { giveItems(randomPlayer, BENUSTAS_SHINING_REWARD_BOX); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java index 589a5110dc..259c67ad2e 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java @@ -154,26 +154,27 @@ public class NightmareKamaloka extends AbstractInstance @Override public String onKill(Npc npc, Player killer, boolean isSummon) { - final Instance instance = npc.getInstanceWorld(); - if (isInInstance(instance)) + final Instance world = npc.getInstanceWorld(); + if (isInInstance(world)) { final int nextDoorId = BOSS_MAP.getOrDefault(npc.getId(), -1); if (nextDoorId == -1) { - for (Player member : instance.getPlayers()) + for (Player member : world.getPlayers()) { giveItems(member, BENUSTAS_REWARD_BOX); } - final Player randomPlayer = instance.getFirstPlayer().getParty().getRandomPlayer(); - if ((randomPlayer != null) && (getRandom(100) < 80) && (instance.getPlayersCount() == instance.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0))) + final Party party = world.getFirstPlayer().getParty(); + final Player randomPlayer = party != null ? party.getRandomPlayer() : null; + if ((randomPlayer != null) && (getRandom(100) < 80) && (world.getPlayersCount() == world.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0))) { giveItems(randomPlayer, BENUSTAS_SHINING_REWARD_BOX); } - instance.finishInstance(); + world.finishInstance(); } else { - instance.openCloseDoor(nextDoorId, true); + world.openCloseDoor(nextDoorId, true); } } return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java index d2735491be..a08ba5051e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java @@ -366,7 +366,8 @@ public class BaylorWarzone extends AbstractInstance { giveItems(member, world.getTemplateId() == TEMPLATE_IDS[0] ? BENUSTAS_REWARD_BOX : BENUSTAS_REWARD_BOX_110); } - final Player randomPlayer = world.getFirstPlayer().getParty().getRandomPlayer(); + final Party party = world.getFirstPlayer().getParty(); + final Player randomPlayer = party != null ? party.getRandomPlayer() : null; if ((randomPlayer != null) && (getRandom(100) < 80) && (world.getPlayersCount() == world.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0))) { giveItems(randomPlayer, BENUSTAS_SHINING_REWARD_BOX); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java index c6ef37e526..eb798bf5b8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java @@ -382,7 +382,8 @@ public class AshenShadowRevolutionaries extends AbstractInstance { giveItems(member, world.getTemplateId() == TEMPLATE_IDS[0] ? BENUSTAS_REWARD_BOX : BENUSTAS_REWARD_BOX_110); } - final Player randomPlayer = world.getFirstPlayer().getParty().getRandomPlayer(); + final Party party = world.getFirstPlayer().getParty(); + final Player randomPlayer = party != null ? party.getRandomPlayer() : null; if ((randomPlayer != null) && (getRandom(100) < 80) && (world.getPlayersCount() == world.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0))) { giveItems(randomPlayer, BENUSTAS_SHINING_REWARD_BOX); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java index 0b7802f76b..3876f168a7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java @@ -441,7 +441,8 @@ public class KrofinNest extends AbstractInstance { final boolean kroshaFirstFormMinionsSpawnedTwice = world.getParameters().getBoolean("KROSHA_FIRST_FORM_MINIONS_SPAWNED_TWICE", false); final boolean kroshaFinalFormSpawned = world.getParameters().getBoolean("KROSHA_FINAL_FORM_SPAWNED", false); - final Player randomPl = world.getFirstPlayer().getParty().getRandomPlayer(); + final Party party = world.getFirstPlayer().getParty(); + final Player randomPlayer = party != null ? party.getRandomPlayer() : null; if (world.getStatus() == 5) { if (CommonUtil.contains(KROSHA_FIRST_FORM_MINIONS, npc.getId())) @@ -473,9 +474,9 @@ public class KrofinNest extends AbstractInstance { giveItems(member, BENUSTAS_REWARD_BOX); } - if ((randomPl != null) && (getRandom(100) < 80) && (world.getPlayersCount() == world.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0))) + if ((randomPlayer != null) && (getRandom(100) < 80) && (world.getPlayersCount() == world.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0))) { - giveItems(randomPl, BENUSTAS_SHINING_REWARD_BOX); + giveItems(randomPlayer, BENUSTAS_SHINING_REWARD_BOX); } showOnScreenMsg(world, NpcStringId.THE_WATER_POWER_PROTECTING_QUEEN_KROSHA_HAS_DISAPPEARED, ExShowScreenMessage.TOP_CENTER, 7000, true); world.finishInstance(); @@ -486,9 +487,9 @@ public class KrofinNest extends AbstractInstance { giveItems(member, BENUSTAS_REWARD_BOX_110); } - if ((randomPl != null) && (getRandom(100) < 80) && (world.getPlayersCount() == world.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0))) + if ((randomPlayer != null) && (getRandom(100) < 80) && (world.getPlayersCount() == world.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0))) { - giveItems(randomPl, BENUSTAS_SHINING_REWARD_BOX); + giveItems(randomPlayer, BENUSTAS_SHINING_REWARD_BOX); } showOnScreenMsg(world, NpcStringId.THE_WATER_POWER_PROTECTING_QUEEN_KROSHA_HAS_DISAPPEARED, ExShowScreenMessage.TOP_CENTER, 7000, true); world.finishInstance(); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java index f561e5bb1f..60c02a5734 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java @@ -169,26 +169,27 @@ public class NightmareKamaloka extends AbstractInstance @Override public String onKill(Npc npc, Player killer, boolean isSummon) { - final Instance instance = npc.getInstanceWorld(); - if (isInInstance(instance)) + final Instance world = npc.getInstanceWorld(); + if (isInInstance(world)) { - final int nextDoorId = instance.getTemplateId() == TEMPLATE_IDS[0] ? BOSS_MAP.getOrDefault(npc.getId(), -1) : BOSS_MAP_110.getOrDefault(npc.getId(), -1); + final int nextDoorId = world.getTemplateId() == TEMPLATE_IDS[0] ? BOSS_MAP.getOrDefault(npc.getId(), -1) : BOSS_MAP_110.getOrDefault(npc.getId(), -1); if (nextDoorId == -1) { - for (Player member : instance.getPlayers()) + for (Player member : world.getPlayers()) { - giveItems(member, instance.getTemplateId() == TEMPLATE_IDS[0] ? BENUSTAS_REWARD_BOX : BENUSTAS_REWARD_BOX_110); + giveItems(member, world.getTemplateId() == TEMPLATE_IDS[0] ? BENUSTAS_REWARD_BOX : BENUSTAS_REWARD_BOX_110); } - final Player randomPlayer = instance.getFirstPlayer().getParty().getRandomPlayer(); - if ((randomPlayer != null) && (getRandom(100) < 80) && (instance.getPlayersCount() == instance.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0))) + final Party party = world.getFirstPlayer().getParty(); + final Player randomPlayer = party != null ? party.getRandomPlayer() : null; + if ((randomPlayer != null) && (getRandom(100) < 80) && (world.getPlayersCount() == world.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0))) { giveItems(randomPlayer, BENUSTAS_SHINING_REWARD_BOX); } - instance.finishInstance(); + world.finishInstance(); } else { - instance.openCloseDoor(nextDoorId, true); + world.openCloseDoor(nextDoorId, true); } } return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java index d2735491be..a08ba5051e 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java @@ -366,7 +366,8 @@ public class BaylorWarzone extends AbstractInstance { giveItems(member, world.getTemplateId() == TEMPLATE_IDS[0] ? BENUSTAS_REWARD_BOX : BENUSTAS_REWARD_BOX_110); } - final Player randomPlayer = world.getFirstPlayer().getParty().getRandomPlayer(); + final Party party = world.getFirstPlayer().getParty(); + final Player randomPlayer = party != null ? party.getRandomPlayer() : null; if ((randomPlayer != null) && (getRandom(100) < 80) && (world.getPlayersCount() == world.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0))) { giveItems(randomPlayer, BENUSTAS_SHINING_REWARD_BOX); diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java index c6ef37e526..eb798bf5b8 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java @@ -382,7 +382,8 @@ public class AshenShadowRevolutionaries extends AbstractInstance { giveItems(member, world.getTemplateId() == TEMPLATE_IDS[0] ? BENUSTAS_REWARD_BOX : BENUSTAS_REWARD_BOX_110); } - final Player randomPlayer = world.getFirstPlayer().getParty().getRandomPlayer(); + final Party party = world.getFirstPlayer().getParty(); + final Player randomPlayer = party != null ? party.getRandomPlayer() : null; if ((randomPlayer != null) && (getRandom(100) < 80) && (world.getPlayersCount() == world.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0))) { giveItems(randomPlayer, BENUSTAS_SHINING_REWARD_BOX); diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java index 0b7802f76b..3876f168a7 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java @@ -441,7 +441,8 @@ public class KrofinNest extends AbstractInstance { final boolean kroshaFirstFormMinionsSpawnedTwice = world.getParameters().getBoolean("KROSHA_FIRST_FORM_MINIONS_SPAWNED_TWICE", false); final boolean kroshaFinalFormSpawned = world.getParameters().getBoolean("KROSHA_FINAL_FORM_SPAWNED", false); - final Player randomPl = world.getFirstPlayer().getParty().getRandomPlayer(); + final Party party = world.getFirstPlayer().getParty(); + final Player randomPlayer = party != null ? party.getRandomPlayer() : null; if (world.getStatus() == 5) { if (CommonUtil.contains(KROSHA_FIRST_FORM_MINIONS, npc.getId())) @@ -473,9 +474,9 @@ public class KrofinNest extends AbstractInstance { giveItems(member, BENUSTAS_REWARD_BOX); } - if ((randomPl != null) && (getRandom(100) < 80) && (world.getPlayersCount() == world.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0))) + if ((randomPlayer != null) && (getRandom(100) < 80) && (world.getPlayersCount() == world.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0))) { - giveItems(randomPl, BENUSTAS_SHINING_REWARD_BOX); + giveItems(randomPlayer, BENUSTAS_SHINING_REWARD_BOX); } showOnScreenMsg(world, NpcStringId.THE_WATER_POWER_PROTECTING_QUEEN_KROSHA_HAS_DISAPPEARED, ExShowScreenMessage.TOP_CENTER, 7000, true); world.finishInstance(); @@ -486,9 +487,9 @@ public class KrofinNest extends AbstractInstance { giveItems(member, BENUSTAS_REWARD_BOX_110); } - if ((randomPl != null) && (getRandom(100) < 80) && (world.getPlayersCount() == world.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0))) + if ((randomPlayer != null) && (getRandom(100) < 80) && (world.getPlayersCount() == world.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0))) { - giveItems(randomPl, BENUSTAS_SHINING_REWARD_BOX); + giveItems(randomPlayer, BENUSTAS_SHINING_REWARD_BOX); } showOnScreenMsg(world, NpcStringId.THE_WATER_POWER_PROTECTING_QUEEN_KROSHA_HAS_DISAPPEARED, ExShowScreenMessage.TOP_CENTER, 7000, true); world.finishInstance(); diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java index f561e5bb1f..60c02a5734 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java @@ -169,26 +169,27 @@ public class NightmareKamaloka extends AbstractInstance @Override public String onKill(Npc npc, Player killer, boolean isSummon) { - final Instance instance = npc.getInstanceWorld(); - if (isInInstance(instance)) + final Instance world = npc.getInstanceWorld(); + if (isInInstance(world)) { - final int nextDoorId = instance.getTemplateId() == TEMPLATE_IDS[0] ? BOSS_MAP.getOrDefault(npc.getId(), -1) : BOSS_MAP_110.getOrDefault(npc.getId(), -1); + final int nextDoorId = world.getTemplateId() == TEMPLATE_IDS[0] ? BOSS_MAP.getOrDefault(npc.getId(), -1) : BOSS_MAP_110.getOrDefault(npc.getId(), -1); if (nextDoorId == -1) { - for (Player member : instance.getPlayers()) + for (Player member : world.getPlayers()) { - giveItems(member, instance.getTemplateId() == TEMPLATE_IDS[0] ? BENUSTAS_REWARD_BOX : BENUSTAS_REWARD_BOX_110); + giveItems(member, world.getTemplateId() == TEMPLATE_IDS[0] ? BENUSTAS_REWARD_BOX : BENUSTAS_REWARD_BOX_110); } - final Player randomPlayer = instance.getFirstPlayer().getParty().getRandomPlayer(); - if ((randomPlayer != null) && (getRandom(100) < 80) && (instance.getPlayersCount() == instance.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0))) + final Party party = world.getFirstPlayer().getParty(); + final Player randomPlayer = party != null ? party.getRandomPlayer() : null; + if ((randomPlayer != null) && (getRandom(100) < 80) && (world.getPlayersCount() == world.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0))) { giveItems(randomPlayer, BENUSTAS_SHINING_REWARD_BOX); } - instance.finishInstance(); + world.finishInstance(); } else { - instance.openCloseDoor(nextDoorId, true); + world.openCloseDoor(nextDoorId, true); } } return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java index d2735491be..a08ba5051e 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java @@ -366,7 +366,8 @@ public class BaylorWarzone extends AbstractInstance { giveItems(member, world.getTemplateId() == TEMPLATE_IDS[0] ? BENUSTAS_REWARD_BOX : BENUSTAS_REWARD_BOX_110); } - final Player randomPlayer = world.getFirstPlayer().getParty().getRandomPlayer(); + final Party party = world.getFirstPlayer().getParty(); + final Player randomPlayer = party != null ? party.getRandomPlayer() : null; if ((randomPlayer != null) && (getRandom(100) < 80) && (world.getPlayersCount() == world.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0))) { giveItems(randomPlayer, BENUSTAS_SHINING_REWARD_BOX); diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java index c6ef37e526..eb798bf5b8 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java @@ -382,7 +382,8 @@ public class AshenShadowRevolutionaries extends AbstractInstance { giveItems(member, world.getTemplateId() == TEMPLATE_IDS[0] ? BENUSTAS_REWARD_BOX : BENUSTAS_REWARD_BOX_110); } - final Player randomPlayer = world.getFirstPlayer().getParty().getRandomPlayer(); + final Party party = world.getFirstPlayer().getParty(); + final Player randomPlayer = party != null ? party.getRandomPlayer() : null; if ((randomPlayer != null) && (getRandom(100) < 80) && (world.getPlayersCount() == world.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0))) { giveItems(randomPlayer, BENUSTAS_SHINING_REWARD_BOX); diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java index 0b7802f76b..3876f168a7 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java @@ -441,7 +441,8 @@ public class KrofinNest extends AbstractInstance { final boolean kroshaFirstFormMinionsSpawnedTwice = world.getParameters().getBoolean("KROSHA_FIRST_FORM_MINIONS_SPAWNED_TWICE", false); final boolean kroshaFinalFormSpawned = world.getParameters().getBoolean("KROSHA_FINAL_FORM_SPAWNED", false); - final Player randomPl = world.getFirstPlayer().getParty().getRandomPlayer(); + final Party party = world.getFirstPlayer().getParty(); + final Player randomPlayer = party != null ? party.getRandomPlayer() : null; if (world.getStatus() == 5) { if (CommonUtil.contains(KROSHA_FIRST_FORM_MINIONS, npc.getId())) @@ -473,9 +474,9 @@ public class KrofinNest extends AbstractInstance { giveItems(member, BENUSTAS_REWARD_BOX); } - if ((randomPl != null) && (getRandom(100) < 80) && (world.getPlayersCount() == world.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0))) + if ((randomPlayer != null) && (getRandom(100) < 80) && (world.getPlayersCount() == world.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0))) { - giveItems(randomPl, BENUSTAS_SHINING_REWARD_BOX); + giveItems(randomPlayer, BENUSTAS_SHINING_REWARD_BOX); } showOnScreenMsg(world, NpcStringId.THE_WATER_POWER_PROTECTING_QUEEN_KROSHA_HAS_DISAPPEARED, ExShowScreenMessage.TOP_CENTER, 7000, true); world.finishInstance(); @@ -486,9 +487,9 @@ public class KrofinNest extends AbstractInstance { giveItems(member, BENUSTAS_REWARD_BOX_110); } - if ((randomPl != null) && (getRandom(100) < 80) && (world.getPlayersCount() == world.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0))) + if ((randomPlayer != null) && (getRandom(100) < 80) && (world.getPlayersCount() == world.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0))) { - giveItems(randomPl, BENUSTAS_SHINING_REWARD_BOX); + giveItems(randomPlayer, BENUSTAS_SHINING_REWARD_BOX); } showOnScreenMsg(world, NpcStringId.THE_WATER_POWER_PROTECTING_QUEEN_KROSHA_HAS_DISAPPEARED, ExShowScreenMessage.TOP_CENTER, 7000, true); world.finishInstance(); diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java index f561e5bb1f..60c02a5734 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java @@ -169,26 +169,27 @@ public class NightmareKamaloka extends AbstractInstance @Override public String onKill(Npc npc, Player killer, boolean isSummon) { - final Instance instance = npc.getInstanceWorld(); - if (isInInstance(instance)) + final Instance world = npc.getInstanceWorld(); + if (isInInstance(world)) { - final int nextDoorId = instance.getTemplateId() == TEMPLATE_IDS[0] ? BOSS_MAP.getOrDefault(npc.getId(), -1) : BOSS_MAP_110.getOrDefault(npc.getId(), -1); + final int nextDoorId = world.getTemplateId() == TEMPLATE_IDS[0] ? BOSS_MAP.getOrDefault(npc.getId(), -1) : BOSS_MAP_110.getOrDefault(npc.getId(), -1); if (nextDoorId == -1) { - for (Player member : instance.getPlayers()) + for (Player member : world.getPlayers()) { - giveItems(member, instance.getTemplateId() == TEMPLATE_IDS[0] ? BENUSTAS_REWARD_BOX : BENUSTAS_REWARD_BOX_110); + giveItems(member, world.getTemplateId() == TEMPLATE_IDS[0] ? BENUSTAS_REWARD_BOX : BENUSTAS_REWARD_BOX_110); } - final Player randomPlayer = instance.getFirstPlayer().getParty().getRandomPlayer(); - if ((randomPlayer != null) && (getRandom(100) < 80) && (instance.getPlayersCount() == instance.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0))) + final Party party = world.getFirstPlayer().getParty(); + final Player randomPlayer = party != null ? party.getRandomPlayer() : null; + if ((randomPlayer != null) && (getRandom(100) < 80) && (world.getPlayersCount() == world.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0))) { giveItems(randomPlayer, BENUSTAS_SHINING_REWARD_BOX); } - instance.finishInstance(); + world.finishInstance(); } else { - instance.openCloseDoor(nextDoorId, true); + world.openCloseDoor(nextDoorId, true); } } return super.onKill(npc, killer, isSummon);