From 9d7ddf9ea4ff0ca3c6fd31514e62fd029b42ca63 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 16 Oct 2020 07:00:06 +0000 Subject: [PATCH] MonsterDailyMissionHandler party member minimum level check. --- .../MonsterDailyMissionHandler.java | 10 ++++++++-- .../MonsterDailyMissionHandler.java | 10 ++++++++-- .../MonsterDailyMissionHandler.java | 10 ++++++++-- .../MonsterDailyMissionHandler.java | 10 ++++++++-- 4 files changed, 32 insertions(+), 8 deletions(-) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/dailymissionhandlers/MonsterDailyMissionHandler.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/dailymissionhandlers/MonsterDailyMissionHandler.java index 08004716cd..545472f4fb 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/dailymissionhandlers/MonsterDailyMissionHandler.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/dailymissionhandlers/MonsterDailyMissionHandler.java @@ -104,9 +104,9 @@ public class MonsterDailyMissionHandler extends AbstractDailyMissionHandler } final PlayerInstance player = event.getAttacker(); + final int monsterLevel = monster.getLevel(); if (_minLevel > 0) { - final int monsterLevel = monster.getLevel(); if ((monsterLevel < _minLevel) || (monsterLevel > _maxLevel) || ((player.getLevel() - monsterLevel) > 5)) { return; @@ -118,7 +118,13 @@ public class MonsterDailyMissionHandler extends AbstractDailyMissionHandler { final CommandChannel channel = party.getCommandChannel(); final List members = channel != null ? channel.getMembers() : party.getMembers(); - members.stream().filter(member -> member.calculateDistance3D(monster) <= Config.ALT_PARTY_RANGE).forEach(this::processPlayerProgress); + for (PlayerInstance member : members) + { + if ((member.getLevel() >= (monsterLevel - 5)) && (member.calculateDistance3D(monster) <= Config.ALT_PARTY_RANGE)) + { + processPlayerProgress(member); + } + } } else { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/dailymissionhandlers/MonsterDailyMissionHandler.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/dailymissionhandlers/MonsterDailyMissionHandler.java index 08004716cd..545472f4fb 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/dailymissionhandlers/MonsterDailyMissionHandler.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/dailymissionhandlers/MonsterDailyMissionHandler.java @@ -104,9 +104,9 @@ public class MonsterDailyMissionHandler extends AbstractDailyMissionHandler } final PlayerInstance player = event.getAttacker(); + final int monsterLevel = monster.getLevel(); if (_minLevel > 0) { - final int monsterLevel = monster.getLevel(); if ((monsterLevel < _minLevel) || (monsterLevel > _maxLevel) || ((player.getLevel() - monsterLevel) > 5)) { return; @@ -118,7 +118,13 @@ public class MonsterDailyMissionHandler extends AbstractDailyMissionHandler { final CommandChannel channel = party.getCommandChannel(); final List members = channel != null ? channel.getMembers() : party.getMembers(); - members.stream().filter(member -> member.calculateDistance3D(monster) <= Config.ALT_PARTY_RANGE).forEach(this::processPlayerProgress); + for (PlayerInstance member : members) + { + if ((member.getLevel() >= (monsterLevel - 5)) && (member.calculateDistance3D(monster) <= Config.ALT_PARTY_RANGE)) + { + processPlayerProgress(member); + } + } } else { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/dailymissionhandlers/MonsterDailyMissionHandler.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/dailymissionhandlers/MonsterDailyMissionHandler.java index 08004716cd..545472f4fb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/dailymissionhandlers/MonsterDailyMissionHandler.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/dailymissionhandlers/MonsterDailyMissionHandler.java @@ -104,9 +104,9 @@ public class MonsterDailyMissionHandler extends AbstractDailyMissionHandler } final PlayerInstance player = event.getAttacker(); + final int monsterLevel = monster.getLevel(); if (_minLevel > 0) { - final int monsterLevel = monster.getLevel(); if ((monsterLevel < _minLevel) || (monsterLevel > _maxLevel) || ((player.getLevel() - monsterLevel) > 5)) { return; @@ -118,7 +118,13 @@ public class MonsterDailyMissionHandler extends AbstractDailyMissionHandler { final CommandChannel channel = party.getCommandChannel(); final List members = channel != null ? channel.getMembers() : party.getMembers(); - members.stream().filter(member -> member.calculateDistance3D(monster) <= Config.ALT_PARTY_RANGE).forEach(this::processPlayerProgress); + for (PlayerInstance member : members) + { + if ((member.getLevel() >= (monsterLevel - 5)) && (member.calculateDistance3D(monster) <= Config.ALT_PARTY_RANGE)) + { + processPlayerProgress(member); + } + } } else { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/dailymissionhandlers/MonsterDailyMissionHandler.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/dailymissionhandlers/MonsterDailyMissionHandler.java index 08004716cd..545472f4fb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/dailymissionhandlers/MonsterDailyMissionHandler.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/dailymissionhandlers/MonsterDailyMissionHandler.java @@ -104,9 +104,9 @@ public class MonsterDailyMissionHandler extends AbstractDailyMissionHandler } final PlayerInstance player = event.getAttacker(); + final int monsterLevel = monster.getLevel(); if (_minLevel > 0) { - final int monsterLevel = monster.getLevel(); if ((monsterLevel < _minLevel) || (monsterLevel > _maxLevel) || ((player.getLevel() - monsterLevel) > 5)) { return; @@ -118,7 +118,13 @@ public class MonsterDailyMissionHandler extends AbstractDailyMissionHandler { final CommandChannel channel = party.getCommandChannel(); final List members = channel != null ? channel.getMembers() : party.getMembers(); - members.stream().filter(member -> member.calculateDistance3D(monster) <= Config.ALT_PARTY_RANGE).forEach(this::processPlayerProgress); + for (PlayerInstance member : members) + { + if ((member.getLevel() >= (monsterLevel - 5)) && (member.calculateDistance3D(monster) <= Config.ALT_PARTY_RANGE)) + { + processPlayerProgress(member); + } + } } else {