NotFriend affect object siege zone checks.
Contributed by nasseka.
This commit is contained in:
parent
601cb30781
commit
3b2a3e6371
@ -85,7 +85,7 @@ public class NotFriend implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ public class NotFriendPc implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -86,7 +86,7 @@ public class NotFriend implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -86,7 +86,7 @@ public class NotFriendPc implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -86,7 +86,7 @@ public class NotFriend implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -86,7 +86,7 @@ public class NotFriendPc implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ public class NotFriend implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ public class NotFriendPc implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ public class NotFriend implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ public class NotFriendPc implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ public class NotFriend implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ public class NotFriendPc implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ public class NotFriend implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ public class NotFriendPc implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ public class NotFriend implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ public class NotFriendPc implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ public class NotFriend implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ public class NotFriendPc implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ public class NotFriend implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ public class NotFriendPc implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ public class NotFriend implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ public class NotFriendPc implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ public class NotFriend implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ public class NotFriendPc implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ public class NotFriend implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ public class NotFriendPc implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ public class NotFriend implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ public class NotFriendPc implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ public class NotFriend implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ public class NotFriendPc implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ public class NotFriend implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ public class NotFriendPc implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ public class NotFriend implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ public class NotFriendPc implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ public class NotFriend implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ public class NotFriendPc implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ public class NotFriend implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ public class NotFriendPc implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ public class NotFriend implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ public class NotFriendPc implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ public class NotFriend implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ public class NotFriendPc implements IAffectObjectHandler
|
||||
}
|
||||
|
||||
// Arena.
|
||||
if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
|
||||
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user