Invisible GM players should not be attackable.
This commit is contained in:
@@ -8185,6 +8185,12 @@ public class Player extends Playable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Invisible GM players should not be attackable.
|
||||||
|
if (isInvisible() && isGM())
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Check if the attacker isn't the Player Pet
|
// Check if the attacker isn't the Player Pet
|
||||||
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -8188,6 +8188,12 @@ public class Player extends Playable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Invisible GM players should not be attackable.
|
||||||
|
if (isInvisible() && isGM())
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Check if the attacker isn't the Player Pet
|
// Check if the attacker isn't the Player Pet
|
||||||
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -8190,6 +8190,12 @@ public class Player extends Playable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Invisible GM players should not be attackable.
|
||||||
|
if (isInvisible() && isGM())
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Check if the attacker isn't the Player Pet
|
// Check if the attacker isn't the Player Pet
|
||||||
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -8208,6 +8208,12 @@ public class Player extends Playable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Invisible GM players should not be attackable.
|
||||||
|
if (isInvisible() && isGM())
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Check if the attacker isn't the Player Pet
|
// Check if the attacker isn't the Player Pet
|
||||||
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -8225,6 +8225,12 @@ public class Player extends Playable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Invisible GM players should not be attackable.
|
||||||
|
if (isInvisible() && isGM())
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Check if the attacker isn't the Player Pet
|
// Check if the attacker isn't the Player Pet
|
||||||
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -8238,6 +8238,12 @@ public class Player extends Playable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Invisible GM players should not be attackable.
|
||||||
|
if (isInvisible() && isGM())
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Check if the attacker isn't the Player Pet
|
// Check if the attacker isn't the Player Pet
|
||||||
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -8239,6 +8239,12 @@ public class Player extends Playable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Invisible GM players should not be attackable.
|
||||||
|
if (isInvisible() && isGM())
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Check if the attacker isn't the Player Pet
|
// Check if the attacker isn't the Player Pet
|
||||||
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -8267,6 +8267,12 @@ public class Player extends Playable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Invisible GM players should not be attackable.
|
||||||
|
if (isInvisible() && isGM())
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Check if the attacker isn't the Player Pet
|
// Check if the attacker isn't the Player Pet
|
||||||
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -8377,6 +8377,12 @@ public class Player extends Playable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Invisible GM players should not be attackable.
|
||||||
|
if (isInvisible() && isGM())
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Check if the attacker isn't the Player Pet
|
// Check if the attacker isn't the Player Pet
|
||||||
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
||||||
{
|
{
|
||||||
|
|||||||
+6
@@ -8403,6 +8403,12 @@ public class Player extends Playable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Invisible GM players should not be attackable.
|
||||||
|
if (isInvisible() && isGM())
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Check if the attacker isn't the Player Pet
|
// Check if the attacker isn't the Player Pet
|
||||||
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -8462,6 +8462,12 @@ public class Player extends Playable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Invisible GM players should not be attackable.
|
||||||
|
if (isInvisible() && isGM())
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Check if the attacker isn't the Player Pet
|
// Check if the attacker isn't the Player Pet
|
||||||
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -8492,6 +8492,12 @@ public class Player extends Playable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Invisible GM players should not be attackable.
|
||||||
|
if (isInvisible() && isGM())
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Check if the attacker isn't the Player Pet
|
// Check if the attacker isn't the Player Pet
|
||||||
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -7937,6 +7937,12 @@ public class Player extends Playable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Invisible GM players should not be attackable.
|
||||||
|
if (isInvisible() && isGM())
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Check if the attacker isn't the Player Pet
|
// Check if the attacker isn't the Player Pet
|
||||||
if ((attacker == this) || (attacker == _summon))
|
if ((attacker == this) || (attacker == _summon))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -8402,6 +8402,12 @@ public class Player extends Playable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Invisible GM players should not be attackable.
|
||||||
|
if (isInvisible() && isGM())
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Check if the attacker isn't the Player Pet
|
// Check if the attacker isn't the Player Pet
|
||||||
if ((attacker == this) || (attacker == _summon))
|
if ((attacker == this) || (attacker == _summon))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -8286,6 +8286,12 @@ public class Player extends Playable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Invisible GM players should not be attackable.
|
||||||
|
if (isInvisible() && isGM())
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Check if the attacker isn't the Player Pet
|
// Check if the attacker isn't the Player Pet
|
||||||
if ((attacker == this) || (attacker == _summon))
|
if ((attacker == this) || (attacker == _summon))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -8086,6 +8086,12 @@ public class Player extends Playable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Invisible GM players should not be attackable.
|
||||||
|
if (isInvisible() && isGM())
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Check if the attacker isn't the Player Pet
|
// Check if the attacker isn't the Player Pet
|
||||||
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
||||||
{
|
{
|
||||||
|
|||||||
+6
@@ -8097,6 +8097,12 @@ public class Player extends Playable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Invisible GM players should not be attackable.
|
||||||
|
if (isInvisible() && isGM())
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Check if the attacker isn't the Player Pet
|
// Check if the attacker isn't the Player Pet
|
||||||
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -8097,6 +8097,12 @@ public class Player extends Playable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Invisible GM players should not be attackable.
|
||||||
|
if (isInvisible() && isGM())
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Check if the attacker isn't the Player Pet
|
// Check if the attacker isn't the Player Pet
|
||||||
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -8097,6 +8097,12 @@ public class Player extends Playable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Invisible GM players should not be attackable.
|
||||||
|
if (isInvisible() && isGM())
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Check if the attacker isn't the Player Pet
|
// Check if the attacker isn't the Player Pet
|
||||||
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -8083,6 +8083,12 @@ public class Player extends Playable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Invisible GM players should not be attackable.
|
||||||
|
if (isInvisible() && isGM())
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Check if the attacker isn't the Player Pet
|
// Check if the attacker isn't the Player Pet
|
||||||
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
||||||
{
|
{
|
||||||
|
|||||||
+6
@@ -8126,6 +8126,12 @@ public class Player extends Playable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Invisible GM players should not be attackable.
|
||||||
|
if (isInvisible() && isGM())
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Check if the attacker isn't the Player Pet
|
// Check if the attacker isn't the Player Pet
|
||||||
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -8173,6 +8173,12 @@ public class Player extends Playable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Invisible GM players should not be attackable.
|
||||||
|
if (isInvisible() && isGM())
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Check if the attacker isn't the Player Pet
|
// Check if the attacker isn't the Player Pet
|
||||||
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
||||||
{
|
{
|
||||||
|
|||||||
+6
@@ -8126,6 +8126,12 @@ public class Player extends Playable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Invisible GM players should not be attackable.
|
||||||
|
if (isInvisible() && isGM())
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Check if the attacker isn't the Player Pet
|
// Check if the attacker isn't the Player Pet
|
||||||
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -8083,6 +8083,12 @@ public class Player extends Playable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Invisible GM players should not be attackable.
|
||||||
|
if (isInvisible() && isGM())
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Check if the attacker isn't the Player Pet
|
// Check if the attacker isn't the Player Pet
|
||||||
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -8072,6 +8072,12 @@ public class Player extends Playable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Invisible GM players should not be attackable.
|
||||||
|
if (isInvisible() && isGM())
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Check if the attacker isn't the Player Pet
|
// Check if the attacker isn't the Player Pet
|
||||||
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
||||||
{
|
{
|
||||||
|
|||||||
+6
@@ -8226,6 +8226,12 @@ public class Player extends Playable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Invisible GM players should not be attackable.
|
||||||
|
if (isInvisible() && isGM())
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Check if the attacker isn't the Player Pet
|
// Check if the attacker isn't the Player Pet
|
||||||
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -8365,6 +8365,12 @@ public class Player extends Playable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Invisible GM players should not be attackable.
|
||||||
|
if (isInvisible() && isGM())
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Check if the attacker isn't the Player Pet
|
// Check if the attacker isn't the Player Pet
|
||||||
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -8605,6 +8605,12 @@ public class Player extends Playable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Invisible GM players should not be attackable.
|
||||||
|
if (isInvisible() && isGM())
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Check if the attacker isn't the Player Pet
|
// Check if the attacker isn't the Player Pet
|
||||||
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -8605,6 +8605,12 @@ public class Player extends Playable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Invisible GM players should not be attackable.
|
||||||
|
if (isInvisible() && isGM())
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Check if the attacker isn't the Player Pet
|
// Check if the attacker isn't the Player Pet
|
||||||
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId()))
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user