Prohibit summoning in timed hunting zones.
This commit is contained in:
@@ -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)
|
if (target == effector)
|
||||||
{
|
{
|
||||||
@@ -125,7 +125,7 @@ public class CallPc extends AbstractEffect
|
|||||||
return false;
|
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);
|
effector.sendPacket(SystemMessageId.YOU_CANNOT_USE_SUMMONING_OR_TELEPORTING_IN_THIS_AREA);
|
||||||
return false;
|
return false;
|
||||||
|
@@ -52,7 +52,7 @@ public class CallTargetParty extends AbstractEffect
|
|||||||
final Party party = player.getParty();
|
final Party party = player.getParty();
|
||||||
if (party != null)
|
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));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -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)
|
if (target == effector)
|
||||||
{
|
{
|
||||||
@@ -125,7 +125,7 @@ public class CallPc extends AbstractEffect
|
|||||||
return false;
|
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);
|
effector.sendPacket(SystemMessageId.YOU_CANNOT_USE_SUMMONING_OR_TELEPORTING_IN_THIS_AREA);
|
||||||
return false;
|
return false;
|
||||||
|
@@ -52,7 +52,7 @@ public class CallTargetParty extends AbstractEffect
|
|||||||
final Party party = player.getParty();
|
final Party party = player.getParty();
|
||||||
if (party != null)
|
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));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user