lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prohibit summoning in timed hunting zones.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-01-03 17:51:56 +00:00
parent 9c61872268
commit d268e06690
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallPc.java vendored
View File

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

2
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java vendored
View File

@@ -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));
}
}
}

4
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallPc.java vendored
View File

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

2
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java vendored
View File

@@ -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));
}
}
}