From d268e06690a944185203fcd79be27a535e8caf88 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 3 Jan 2020 17:51:56 +0000 Subject: [PATCH] Prohibit summoning in timed hunting zones. --- .../game/data/scripts/handlers/effecthandlers/CallPc.java | 4 ++-- .../data/scripts/handlers/effecthandlers/CallTargetParty.java | 2 +- .../game/data/scripts/handlers/effecthandlers/CallPc.java | 4 ++-- .../data/scripts/handlers/effecthandlers/CallTargetParty.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index 0760fb675e..f6e51392b7 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -88,7 +88,7 @@ public class CallPc extends AbstractEffect } } - public static boolean checkSummonTargetStatus(PlayerInstance target, Creature effector) + public static boolean checkSummonTargetStatus(PlayerInstance target, PlayerInstance effector) { if (target == effector) { @@ -125,7 +125,7 @@ public class CallPc extends AbstractEffect return false; } - if (target.isFlyingMounted() || target.isCombatFlagEquipped() || target.isInTraingCamp()) + if (target.isFlyingMounted() || target.isCombatFlagEquipped() || target.isInTraingCamp() || target.isInTimedHuntingZone() || effector.isInTimedHuntingZone()) { effector.sendPacket(SystemMessageId.YOU_CANNOT_USE_SUMMONING_OR_TELEPORTING_IN_THIS_AREA); return false; diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java index d48eb90fb3..6d5d7eacfc 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java @@ -52,7 +52,7 @@ public class CallTargetParty extends AbstractEffect final Party party = player.getParty(); if (party != null) { - party.getMembers().stream().filter(p -> (p != player) && CallPc.checkSummonTargetStatus(p, effector)).forEach(p -> p.teleToLocation(player.getLocation(), true)); + party.getMembers().stream().filter(p -> (p != player) && CallPc.checkSummonTargetStatus(p, effector.getActingPlayer())).forEach(p -> p.teleToLocation(player.getLocation(), true)); } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index 0760fb675e..f6e51392b7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -88,7 +88,7 @@ public class CallPc extends AbstractEffect } } - public static boolean checkSummonTargetStatus(PlayerInstance target, Creature effector) + public static boolean checkSummonTargetStatus(PlayerInstance target, PlayerInstance effector) { if (target == effector) { @@ -125,7 +125,7 @@ public class CallPc extends AbstractEffect return false; } - if (target.isFlyingMounted() || target.isCombatFlagEquipped() || target.isInTraingCamp()) + if (target.isFlyingMounted() || target.isCombatFlagEquipped() || target.isInTraingCamp() || target.isInTimedHuntingZone() || effector.isInTimedHuntingZone()) { effector.sendPacket(SystemMessageId.YOU_CANNOT_USE_SUMMONING_OR_TELEPORTING_IN_THIS_AREA); return false; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java index d48eb90fb3..6d5d7eacfc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java @@ -52,7 +52,7 @@ public class CallTargetParty extends AbstractEffect final Party party = player.getParty(); if (party != null) { - party.getMembers().stream().filter(p -> (p != player) && CallPc.checkSummonTargetStatus(p, effector)).forEach(p -> p.teleToLocation(player.getLocation(), true)); + party.getMembers().stream().filter(p -> (p != player) && CallPc.checkSummonTargetStatus(p, effector.getActingPlayer())).forEach(p -> p.teleToLocation(player.getLocation(), true)); } } }