Custom event team prohibitions.

Contributed by Trance.
This commit is contained in:
MobiusDevelopment 2020-09-24 00:03:50 +00:00
parent e84129002b
commit 929082db90
60 changed files with 555 additions and 0 deletions

View File

@ -78,6 +78,12 @@ public class NotFriend implements IAffectObjectHandler
return false;
}
// Events.
if (player.isOnCustomEvent() && (player.getTeam() == target.getTeam()))
{
return false;
}
// Arena.
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{

View File

@ -78,6 +78,12 @@ public class NotFriendPc implements IAffectObjectHandler
return false;
}
// Events.
if (player.isOnCustomEvent() && (player.getTeam() == target.getTeam()))
{
return false;
}
// Arena.
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{

View File

@ -971,6 +971,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Events.
else if (getActingPlayer().isOnCustomEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
{
sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
else if (isInsidePeaceZone(this, target))
{

View File

@ -1080,6 +1080,25 @@ public class SkillCaster implements Runnable
caster.sendPacket(sm);
return false;
}
// Events.
if (player.isOnCustomEvent())
{
if (skill.hasEffectType(EffectType.TELEPORT)) // Disable teleport skills.
{
player.sendMessage("You cannot use " + skill.getName() + " while attending an event.");
return false;
}
if (skill.isBad())
{
final WorldObject target = player.getTarget();
if ((target != null) && target.isPlayable() && (player.getTeam() == target.getActingPlayer().getTeam()))
{
return false;
}
}
}
}
return true;
}

View File

@ -79,6 +79,12 @@ public class NotFriend implements IAffectObjectHandler
return false;
}
// Events.
if (player.isOnCustomEvent() && (player.getTeam() == target.getTeam()))
{
return false;
}
// Arena.
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{

View File

@ -79,6 +79,12 @@ public class NotFriendPc implements IAffectObjectHandler
return false;
}
// Events.
if (player.isOnCustomEvent() && (player.getTeam() == target.getTeam()))
{
return false;
}
// Arena.
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{

View File

@ -971,6 +971,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Events.
else if (getActingPlayer().isOnCustomEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
{
sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
else if (isInsidePeaceZone(this, target))
{

View File

@ -1080,6 +1080,25 @@ public class SkillCaster implements Runnable
caster.sendPacket(sm);
return false;
}
// Events.
if (player.isOnCustomEvent())
{
if (skill.hasEffectType(EffectType.TELEPORT)) // Disable teleport skills.
{
player.sendMessage("You cannot use " + skill.getName() + " while attending an event.");
return false;
}
if (skill.isBad())
{
final WorldObject target = player.getTarget();
if ((target != null) && target.isPlayable() && (player.getTeam() == target.getActingPlayer().getTeam()))
{
return false;
}
}
}
}
return true;
}

View File

@ -79,6 +79,12 @@ public class NotFriend implements IAffectObjectHandler
return false;
}
// Events.
if (player.isOnCustomEvent() && (player.getTeam() == target.getTeam()))
{
return false;
}
// Arena.
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{

View File

@ -79,6 +79,12 @@ public class NotFriendPc implements IAffectObjectHandler
return false;
}
// Events.
if (player.isOnCustomEvent() && (player.getTeam() == target.getTeam()))
{
return false;
}
// Arena.
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{

View File

@ -971,6 +971,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Events.
else if (getActingPlayer().isOnCustomEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
{
sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
else if (isInsidePeaceZone(this, target))
{

View File

@ -1080,6 +1080,25 @@ public class SkillCaster implements Runnable
caster.sendPacket(sm);
return false;
}
// Events.
if (player.isOnCustomEvent())
{
if (skill.hasEffectType(EffectType.TELEPORT)) // Disable teleport skills.
{
player.sendMessage("You cannot use " + skill.getName() + " while attending an event.");
return false;
}
if (skill.isBad())
{
final WorldObject target = player.getTarget();
if ((target != null) && target.isPlayable() && (player.getTeam() == target.getActingPlayer().getTeam()))
{
return false;
}
}
}
}
return true;
}

View File

@ -78,6 +78,12 @@ public class NotFriend implements IAffectObjectHandler
return false;
}
// Events.
if (player.isOnCustomEvent() && (player.getTeam() == target.getTeam()))
{
return false;
}
// Arena.
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{

View File

@ -78,6 +78,12 @@ public class NotFriendPc implements IAffectObjectHandler
return false;
}
// Events.
if (player.isOnCustomEvent() && (player.getTeam() == target.getTeam()))
{
return false;
}
// Arena.
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{

View File

@ -971,6 +971,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Events.
else if (getActingPlayer().isOnCustomEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
{
sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
else if (isInsidePeaceZone(this, target))
{

View File

@ -1080,6 +1080,25 @@ public class SkillCaster implements Runnable
caster.sendPacket(sm);
return false;
}
// Events.
if (player.isOnCustomEvent())
{
if (skill.hasEffectType(EffectType.TELEPORT)) // Disable teleport skills.
{
player.sendMessage("You cannot use " + skill.getName() + " while attending an event.");
return false;
}
if (skill.isBad())
{
final WorldObject target = player.getTarget();
if ((target != null) && target.isPlayable() && (player.getTeam() == target.getActingPlayer().getTeam()))
{
return false;
}
}
}
}
return true;
}

View File

@ -78,6 +78,12 @@ public class NotFriend implements IAffectObjectHandler
return false;
}
// Events.
if (player.isOnCustomEvent() && (player.getTeam() == target.getTeam()))
{
return false;
}
// Arena.
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{

View File

@ -78,6 +78,12 @@ public class NotFriendPc implements IAffectObjectHandler
return false;
}
// Events.
if (player.isOnCustomEvent() && (player.getTeam() == target.getTeam()))
{
return false;
}
// Arena.
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{

View File

@ -971,6 +971,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Events.
else if (getActingPlayer().isOnCustomEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
{
sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
else if (isInsidePeaceZone(this, target))
{

View File

@ -1080,6 +1080,25 @@ public class SkillCaster implements Runnable
caster.sendPacket(sm);
return false;
}
// Events.
if (player.isOnCustomEvent())
{
if (skill.hasEffectType(EffectType.TELEPORT)) // Disable teleport skills.
{
player.sendMessage("You cannot use " + skill.getName() + " while attending an event.");
return false;
}
if (skill.isBad())
{
final WorldObject target = player.getTarget();
if ((target != null) && target.isPlayable() && (player.getTeam() == target.getActingPlayer().getTeam()))
{
return false;
}
}
}
}
return true;
}

View File

@ -78,6 +78,12 @@ public class NotFriend implements IAffectObjectHandler
return false;
}
// Events.
if (player.isOnCustomEvent() && (player.getTeam() == target.getTeam()))
{
return false;
}
// Arena.
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{

View File

@ -78,6 +78,12 @@ public class NotFriendPc implements IAffectObjectHandler
return false;
}
// Events.
if (player.isOnCustomEvent() && (player.getTeam() == target.getTeam()))
{
return false;
}
// Arena.
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{

View File

@ -971,6 +971,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Events.
else if (getActingPlayer().isOnCustomEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
{
sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
else if (isInsidePeaceZone(this, target))
{

View File

@ -1080,6 +1080,25 @@ public class SkillCaster implements Runnable
caster.sendPacket(sm);
return false;
}
// Events.
if (player.isOnCustomEvent())
{
if (skill.hasEffectType(EffectType.TELEPORT)) // Disable teleport skills.
{
player.sendMessage("You cannot use " + skill.getName() + " while attending an event.");
return false;
}
if (skill.isBad())
{
final WorldObject target = player.getTarget();
if ((target != null) && target.isPlayable() && (player.getTeam() == target.getActingPlayer().getTeam()))
{
return false;
}
}
}
}
return true;
}

View File

@ -78,6 +78,12 @@ public class NotFriend implements IAffectObjectHandler
return false;
}
// Events.
if (player.isOnCustomEvent() && (player.getTeam() == target.getTeam()))
{
return false;
}
// Arena.
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{

View File

@ -78,6 +78,12 @@ public class NotFriendPc implements IAffectObjectHandler
return false;
}
// Events.
if (player.isOnCustomEvent() && (player.getTeam() == target.getTeam()))
{
return false;
}
// Arena.
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{

View File

@ -971,6 +971,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Events.
else if (getActingPlayer().isOnCustomEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
{
sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
else if (isInsidePeaceZone(this, target))
{

View File

@ -1080,6 +1080,25 @@ public class SkillCaster implements Runnable
caster.sendPacket(sm);
return false;
}
// Events.
if (player.isOnCustomEvent())
{
if (skill.hasEffectType(EffectType.TELEPORT)) // Disable teleport skills.
{
player.sendMessage("You cannot use " + skill.getName() + " while attending an event.");
return false;
}
if (skill.isBad())
{
final WorldObject target = player.getTarget();
if ((target != null) && target.isPlayable() && (player.getTeam() == target.getActingPlayer().getTeam()))
{
return false;
}
}
}
}
return true;
}

View File

@ -78,6 +78,12 @@ public class NotFriend implements IAffectObjectHandler
return false;
}
// Events.
if (player.isOnCustomEvent() && (player.getTeam() == target.getTeam()))
{
return false;
}
// Arena.
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{

View File

@ -78,6 +78,12 @@ public class NotFriendPc implements IAffectObjectHandler
return false;
}
// Events.
if (player.isOnCustomEvent() && (player.getTeam() == target.getTeam()))
{
return false;
}
// Arena.
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{

View File

@ -971,6 +971,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Events.
else if (getActingPlayer().isOnCustomEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
{
sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
else if (isInsidePeaceZone(this, target))
{

View File

@ -1080,6 +1080,25 @@ public class SkillCaster implements Runnable
caster.sendPacket(sm);
return false;
}
// Events.
if (player.isOnCustomEvent())
{
if (skill.hasEffectType(EffectType.TELEPORT)) // Disable teleport skills.
{
player.sendMessage("You cannot use " + skill.getName() + " while attending an event.");
return false;
}
if (skill.isBad())
{
final WorldObject target = player.getTarget();
if ((target != null) && target.isPlayable() && (player.getTeam() == target.getActingPlayer().getTeam()))
{
return false;
}
}
}
}
return true;
}

View File

@ -78,6 +78,12 @@ public class NotFriend implements IAffectObjectHandler
return false;
}
// Events.
if (player.isOnCustomEvent() && (player.getTeam() == target.getTeam()))
{
return false;
}
// Arena.
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{

View File

@ -78,6 +78,12 @@ public class NotFriendPc implements IAffectObjectHandler
return false;
}
// Events.
if (player.isOnCustomEvent() && (player.getTeam() == target.getTeam()))
{
return false;
}
// Arena.
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{

View File

@ -971,6 +971,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Events.
else if (getActingPlayer().isOnCustomEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
{
sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
else if (isInsidePeaceZone(this, target))
{

View File

@ -1080,6 +1080,25 @@ public class SkillCaster implements Runnable
caster.sendPacket(sm);
return false;
}
// Events.
if (player.isOnCustomEvent())
{
if (skill.hasEffectType(EffectType.TELEPORT)) // Disable teleport skills.
{
player.sendMessage("You cannot use " + skill.getName() + " while attending an event.");
return false;
}
if (skill.isBad())
{
final WorldObject target = player.getTarget();
if ((target != null) && target.isPlayable() && (player.getTeam() == target.getActingPlayer().getTeam()))
{
return false;
}
}
}
}
return true;
}

View File

@ -78,6 +78,12 @@ public class NotFriend implements IAffectObjectHandler
return false;
}
// Events.
if (player.isOnCustomEvent() && (player.getTeam() == target.getTeam()))
{
return false;
}
// Arena.
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{

View File

@ -78,6 +78,12 @@ public class NotFriendPc implements IAffectObjectHandler
return false;
}
// Events.
if (player.isOnCustomEvent() && (player.getTeam() == target.getTeam()))
{
return false;
}
// Arena.
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{

View File

@ -971,6 +971,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Events.
else if (getActingPlayer().isOnCustomEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
{
sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
else if (isInsidePeaceZone(this, target))
{

View File

@ -1080,6 +1080,25 @@ public class SkillCaster implements Runnable
caster.sendPacket(sm);
return false;
}
// Events.
if (player.isOnCustomEvent())
{
if (skill.hasEffectType(EffectType.TELEPORT)) // Disable teleport skills.
{
player.sendMessage("You cannot use " + skill.getName() + " while attending an event.");
return false;
}
if (skill.isBad())
{
final WorldObject target = player.getTarget();
if ((target != null) && target.isPlayable() && (player.getTeam() == target.getActingPlayer().getTeam()))
{
return false;
}
}
}
}
return true;
}

View File

@ -78,6 +78,12 @@ public class NotFriend implements IAffectObjectHandler
return false;
}
// Events.
if (player.isOnCustomEvent() && (player.getTeam() == target.getTeam()))
{
return false;
}
// Arena.
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{

View File

@ -78,6 +78,12 @@ public class NotFriendPc implements IAffectObjectHandler
return false;
}
// Events.
if (player.isOnCustomEvent() && (player.getTeam() == target.getTeam()))
{
return false;
}
// Arena.
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{

View File

@ -971,6 +971,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Events.
else if (getActingPlayer().isOnCustomEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
{
sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
else if (isInsidePeaceZone(this, target))
{

View File

@ -1080,6 +1080,25 @@ public class SkillCaster implements Runnable
caster.sendPacket(sm);
return false;
}
// Events.
if (player.isOnCustomEvent())
{
if (skill.hasEffectType(EffectType.TELEPORT)) // Disable teleport skills.
{
player.sendMessage("You cannot use " + skill.getName() + " while attending an event.");
return false;
}
if (skill.isBad())
{
final WorldObject target = player.getTarget();
if ((target != null) && target.isPlayable() && (player.getTeam() == target.getActingPlayer().getTeam()))
{
return false;
}
}
}
}
return true;
}

View File

@ -78,6 +78,12 @@ public class NotFriend implements IAffectObjectHandler
return false;
}
// Events.
if (player.isOnCustomEvent() && (player.getTeam() == target.getTeam()))
{
return false;
}
// Arena.
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{

View File

@ -78,6 +78,12 @@ public class NotFriendPc implements IAffectObjectHandler
return false;
}
// Events.
if (player.isOnCustomEvent() && (player.getTeam() == target.getTeam()))
{
return false;
}
// Arena.
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{

View File

@ -972,6 +972,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Events.
else if (getActingPlayer().isOnCustomEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
{
sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
else if (isInsidePeaceZone(this, target))
{

View File

@ -1080,6 +1080,25 @@ public class SkillCaster implements Runnable
caster.sendPacket(sm);
return false;
}
// Events.
if (player.isOnCustomEvent())
{
if (skill.hasEffectType(EffectType.TELEPORT)) // Disable teleport skills.
{
player.sendMessage("You cannot use " + skill.getName() + " while attending an event.");
return false;
}
if (skill.isBad())
{
final WorldObject target = player.getTarget();
if ((target != null) && target.isPlayable() && (player.getTeam() == target.getActingPlayer().getTeam()))
{
return false;
}
}
}
}
return true;
}

View File

@ -78,6 +78,12 @@ public class NotFriend implements IAffectObjectHandler
return false;
}
// Events.
if (player.isOnCustomEvent() && (player.getTeam() == target.getTeam()))
{
return false;
}
// Arena.
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{

View File

@ -78,6 +78,12 @@ public class NotFriendPc implements IAffectObjectHandler
return false;
}
// Events.
if (player.isOnCustomEvent() && (player.getTeam() == target.getTeam()))
{
return false;
}
// Arena.
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{

View File

@ -972,6 +972,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Events.
else if (getActingPlayer().isOnCustomEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
{
sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
else if (isInsidePeaceZone(this, target))
{

View File

@ -1080,6 +1080,25 @@ public class SkillCaster implements Runnable
caster.sendPacket(sm);
return false;
}
// Events.
if (player.isOnCustomEvent())
{
if (skill.hasEffectType(EffectType.TELEPORT)) // Disable teleport skills.
{
player.sendMessage("You cannot use " + skill.getName() + " while attending an event.");
return false;
}
if (skill.isBad())
{
final WorldObject target = player.getTarget();
if ((target != null) && target.isPlayable() && (player.getTeam() == target.getActingPlayer().getTeam()))
{
return false;
}
}
}
}
return true;
}

View File

@ -78,6 +78,12 @@ public class NotFriend implements IAffectObjectHandler
return false;
}
// Events.
if (player.isOnCustomEvent() && (player.getTeam() == target.getTeam()))
{
return false;
}
// Arena.
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{

View File

@ -78,6 +78,12 @@ public class NotFriendPc implements IAffectObjectHandler
return false;
}
// Events.
if (player.isOnCustomEvent() && (player.getTeam() == target.getTeam()))
{
return false;
}
// Arena.
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{

View File

@ -972,6 +972,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Events.
else if (getActingPlayer().isOnCustomEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
{
sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
else if (isInsidePeaceZone(this, target))
{

View File

@ -1080,6 +1080,25 @@ public class SkillCaster implements Runnable
caster.sendPacket(sm);
return false;
}
// Events.
if (player.isOnCustomEvent())
{
if (skill.hasEffectType(EffectType.TELEPORT)) // Disable teleport skills.
{
player.sendMessage("You cannot use " + skill.getName() + " while attending an event.");
return false;
}
if (skill.isBad())
{
final WorldObject target = player.getTarget();
if ((target != null) && target.isPlayable() && (player.getTeam() == target.getActingPlayer().getTeam()))
{
return false;
}
}
}
}
return true;
}

View File

@ -78,6 +78,12 @@ public class NotFriend implements IAffectObjectHandler
return false;
}
// Events.
if (player.isOnCustomEvent() && (player.getTeam() == target.getTeam()))
{
return false;
}
// Arena.
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{

View File

@ -78,6 +78,12 @@ public class NotFriendPc implements IAffectObjectHandler
return false;
}
// Events.
if (player.isOnCustomEvent() && (player.getTeam() == target.getTeam()))
{
return false;
}
// Arena.
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{

View File

@ -971,6 +971,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Events.
else if (getActingPlayer().isOnCustomEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
{
sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
else if (isInsidePeaceZone(this, target))
{

View File

@ -1080,6 +1080,25 @@ public class SkillCaster implements Runnable
caster.sendPacket(sm);
return false;
}
// Events.
if (player.isOnCustomEvent())
{
if (skill.hasEffectType(EffectType.TELEPORT)) // Disable teleport skills.
{
player.sendMessage("You cannot use " + skill.getName() + " while attending an event.");
return false;
}
if (skill.isBad())
{
final WorldObject target = player.getTarget();
if ((target != null) && target.isPlayable() && (player.getTeam() == target.getActingPlayer().getTeam()))
{
return false;
}
}
}
}
return true;
}