From 3745ac6bd48c0b2f3cea3e79c2e2c56c1efd104f Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 17 Dec 2022 05:53:53 +0000 Subject: [PATCH] Fixed Water Dragon Elite Supply box and Aether drops checks. Contributed by CostyKiller. --- .../dist/game/data/scripts/ai/others/AetherDrops.java | 3 ++- .../dist/game/data/scripts/ai/others/AetherDrops.java | 3 ++- .../data/scripts/ai/others/WaterDragonEliteSupplyDrops.java | 3 ++- .../dist/game/data/scripts/ai/others/AetherDrops.java | 3 ++- .../data/scripts/ai/others/WaterDragonEliteSupplyDrops.java | 3 ++- .../dist/game/data/scripts/ai/others/AetherDrops.java | 3 ++- .../data/scripts/ai/others/WaterDragonEliteSupplyDrops.java | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/AetherDrops.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/AetherDrops.java index 828e98f08b..ba90e39768 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/AetherDrops.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/AetherDrops.java @@ -21,6 +21,7 @@ import java.sql.PreparedStatement; import java.util.Calendar; import java.util.logging.Level; +import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; @@ -137,7 +138,7 @@ public class AetherDrops extends AbstractNpcAI public String onKill(Npc npc, Player killer, boolean isSummon) { final Player player = getRandomPartyMember(killer); - if ((player.getLevel() >= PLAYER_LEVEL) && (getRandom(100) < CHANCE)) + if ((player.getLevel() >= PLAYER_LEVEL) && (getRandom(100) < CHANCE) && ((player.getParty() == null) || ((player.getParty() != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)))) { final int count = player.getVariables().getInt(AETHER_DROP_COUNT_VAR, 0); if (count < DROP_DAILY) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/AetherDrops.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/AetherDrops.java index 828e98f08b..ba90e39768 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/AetherDrops.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/AetherDrops.java @@ -21,6 +21,7 @@ import java.sql.PreparedStatement; import java.util.Calendar; import java.util.logging.Level; +import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; @@ -137,7 +138,7 @@ public class AetherDrops extends AbstractNpcAI public String onKill(Npc npc, Player killer, boolean isSummon) { final Player player = getRandomPartyMember(killer); - if ((player.getLevel() >= PLAYER_LEVEL) && (getRandom(100) < CHANCE)) + if ((player.getLevel() >= PLAYER_LEVEL) && (getRandom(100) < CHANCE) && ((player.getParty() == null) || ((player.getParty() != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)))) { final int count = player.getVariables().getInt(AETHER_DROP_COUNT_VAR, 0); if (count < DROP_DAILY) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java index a58ca1b5ec..1859ca1d3c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java @@ -21,6 +21,7 @@ import java.sql.PreparedStatement; import java.util.Calendar; import java.util.logging.Level; +import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; @@ -117,7 +118,7 @@ public class WaterDragonEliteSupplyDrops extends AbstractNpcAI public String onKill(Npc npc, Player killer, boolean isSummon) { final Player player = getRandomPartyMember(killer); - if ((player.getLevel() >= PLAYER_LEVEL) && (getRandom(100) < CHANCE)) + if ((player.getLevel() >= PLAYER_LEVEL) && (getRandom(100) < CHANCE) && ((player.getParty() == null) || ((player.getParty() != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)))) { final int count = player.getVariables().getInt(WATER_DRAGON_ELITE_SUPPLIES_COUNT_VAR, 0); if (count < DROP_DAILY) diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/AetherDrops.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/AetherDrops.java index 8a0957935f..c902cd5328 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/AetherDrops.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/AetherDrops.java @@ -21,6 +21,7 @@ import java.sql.PreparedStatement; import java.util.Calendar; import java.util.logging.Level; +import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; @@ -296,7 +297,7 @@ public class AetherDrops extends AbstractNpcAI public String onKill(Npc npc, Player killer, boolean isSummon) { final Player player = getRandomPartyMember(killer); - if ((player.getLevel() >= PLAYER_LEVEL) && (getRandom(100) < CHANCE)) + if ((player.getLevel() >= PLAYER_LEVEL) && (getRandom(100) < CHANCE) && ((player.getParty() == null) || ((player.getParty() != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)))) { final int count = player.getVariables().getInt(AETHER_DROP_COUNT_VAR, 0); if (count < DROP_DAILY) diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java index a58ca1b5ec..1859ca1d3c 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java @@ -21,6 +21,7 @@ import java.sql.PreparedStatement; import java.util.Calendar; import java.util.logging.Level; +import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; @@ -117,7 +118,7 @@ public class WaterDragonEliteSupplyDrops extends AbstractNpcAI public String onKill(Npc npc, Player killer, boolean isSummon) { final Player player = getRandomPartyMember(killer); - if ((player.getLevel() >= PLAYER_LEVEL) && (getRandom(100) < CHANCE)) + if ((player.getLevel() >= PLAYER_LEVEL) && (getRandom(100) < CHANCE) && ((player.getParty() == null) || ((player.getParty() != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)))) { final int count = player.getVariables().getInt(WATER_DRAGON_ELITE_SUPPLIES_COUNT_VAR, 0); if (count < DROP_DAILY) diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/AetherDrops.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/AetherDrops.java index 8a0957935f..c902cd5328 100644 --- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/AetherDrops.java +++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/AetherDrops.java @@ -21,6 +21,7 @@ import java.sql.PreparedStatement; import java.util.Calendar; import java.util.logging.Level; +import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; @@ -296,7 +297,7 @@ public class AetherDrops extends AbstractNpcAI public String onKill(Npc npc, Player killer, boolean isSummon) { final Player player = getRandomPartyMember(killer); - if ((player.getLevel() >= PLAYER_LEVEL) && (getRandom(100) < CHANCE)) + if ((player.getLevel() >= PLAYER_LEVEL) && (getRandom(100) < CHANCE) && ((player.getParty() == null) || ((player.getParty() != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)))) { final int count = player.getVariables().getInt(AETHER_DROP_COUNT_VAR, 0); if (count < DROP_DAILY) diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java index a58ca1b5ec..1859ca1d3c 100644 --- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java +++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java @@ -21,6 +21,7 @@ import java.sql.PreparedStatement; import java.util.Calendar; import java.util.logging.Level; +import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; @@ -117,7 +118,7 @@ public class WaterDragonEliteSupplyDrops extends AbstractNpcAI public String onKill(Npc npc, Player killer, boolean isSummon) { final Player player = getRandomPartyMember(killer); - if ((player.getLevel() >= PLAYER_LEVEL) && (getRandom(100) < CHANCE)) + if ((player.getLevel() >= PLAYER_LEVEL) && (getRandom(100) < CHANCE) && ((player.getParty() == null) || ((player.getParty() != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)))) { final int count = player.getVariables().getInt(WATER_DRAGON_ELITE_SUPPLIES_COUNT_VAR, 0); if (count < DROP_DAILY)