diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java index 6c9d195886..69a319ab14 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java @@ -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)) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java index 61a794242d..9b51f9f573 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java @@ -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)) { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java index d4dadf9a11..f6e9b8aa6d 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -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)) { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index 2cb86b204e..0b1118cefc 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -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; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java index 23f2d346f4..dd5edc672a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java @@ -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)) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java index 2ba3613bfa..c7e56162c7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java @@ -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)) { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java index d4dadf9a11..f6e9b8aa6d 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -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)) { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index 4380a02653..35622e415b 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -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; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java index 23f2d346f4..dd5edc672a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java @@ -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)) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java index 2ba3613bfa..c7e56162c7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java @@ -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)) { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java index a1406ae83e..da6bf02b4a 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -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)) { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index 4380a02653..35622e415b 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -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; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java index 6c9d195886..69a319ab14 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java @@ -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)) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java index 61a794242d..9b51f9f573 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java @@ -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)) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java index a1406ae83e..da6bf02b4a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -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)) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index 4380a02653..35622e415b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -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; } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java index 6c9d195886..69a319ab14 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java @@ -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)) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java index 61a794242d..9b51f9f573 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java @@ -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)) { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java index 07358d4183..c6c4f899c9 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -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)) { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index c6795e00e8..ba4ecea32d 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -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; } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java index 6c9d195886..69a319ab14 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java @@ -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)) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java index 61a794242d..9b51f9f573 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java @@ -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)) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java index 07358d4183..c6c4f899c9 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -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)) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index c6795e00e8..ba4ecea32d 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -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; } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java index 6c9d195886..69a319ab14 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java @@ -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)) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java index 61a794242d..9b51f9f573 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java @@ -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)) { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java index 07358d4183..c6c4f899c9 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -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)) { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index c6795e00e8..ba4ecea32d 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -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; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java index 6c9d195886..69a319ab14 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java @@ -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)) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java index 61a794242d..9b51f9f573 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java @@ -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)) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java index bf58f0fbc7..4220f01130 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -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)) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index 2c4d13e7c4..ac1358b0d9 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -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; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java index 6c9d195886..69a319ab14 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java @@ -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)) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java index 61a794242d..9b51f9f573 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java @@ -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)) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java index 71c1875c3e..6f5dd7de99 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -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)) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index fec11b7a57..89fe298fca 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -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; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java index 6c9d195886..69a319ab14 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java @@ -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)) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java index 61a794242d..9b51f9f573 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java @@ -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)) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java index 71c1875c3e..6f5dd7de99 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -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)) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index fec11b7a57..89fe298fca 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -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; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java index 6c9d195886..69a319ab14 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java @@ -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)) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java index 61a794242d..9b51f9f573 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java @@ -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)) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java index 17964d8664..789776719b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -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)) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index fec11b7a57..89fe298fca 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -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; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java index 6c9d195886..69a319ab14 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java @@ -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)) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java index 61a794242d..9b51f9f573 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java @@ -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)) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java index 0d36603c7d..d72ad7d485 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -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)) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index fec11b7a57..89fe298fca 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -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; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java index 6c9d195886..69a319ab14 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java @@ -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)) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java index 61a794242d..9b51f9f573 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java @@ -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)) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java index 0d36603c7d..d72ad7d485 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -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)) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index fec11b7a57..89fe298fca 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -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; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java index 6c9d195886..69a319ab14 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java @@ -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)) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java index 61a794242d..9b51f9f573 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java @@ -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)) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java index f036c9d357..c0fb6386d9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -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)) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index e139661899..96f0346c7b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -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; } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java index 6c9d195886..69a319ab14 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java @@ -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)) { diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java index 61a794242d..9b51f9f573 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java @@ -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)) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java index 71c1875c3e..6f5dd7de99 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -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)) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index fec11b7a57..89fe298fca 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -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; }