NotFriend affect object siege zone checks.

Contributed by nasseka.
This commit is contained in:
MobiusDevelopment 2021-12-02 23:32:09 +00:00
parent 601cb30781
commit 3b2a3e6371
42 changed files with 42 additions and 42 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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