SpigotMC
/
Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

self-inflicted damage (such as ender pearl usage) is no longer prevented with a message like "you cannot hurt you"

This commit is contained in:
Brettflan 2012-01-17 02:56:22 -06:00
parent 9534a72d44
commit a44336ff04
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/massivecraft/factions/listeners/FactionsEntityListener.java
View File

@ -268,31 +268,26 @@ public class FactionsEntityListener extends EntityListener
int damage = sub.getDamage(); int damage = sub.getDamage();
if ( ! (damagee instanceof Player)) if ( ! (damagee instanceof Player))
{
return true; return true;
}
FPlayer defender = FPlayers.i.get((Player)damagee); FPlayer defender = FPlayers.i.get((Player)damagee);
if (defender == null || defender.getPlayer() == null) if (defender == null || defender.getPlayer() == null)
{
return true; return true;
}
Location defenderLoc = defender.getPlayer().getLocation(); Location defenderLoc = defender.getPlayer().getLocation();
if (Conf.worldsIgnorePvP.contains(defenderLoc.getWorld().getName())) if (Conf.worldsIgnorePvP.contains(defenderLoc.getWorld().getName()))
{
return true; return true;
}
Faction defLocFaction = Board.getFactionAt(new FLocation(defenderLoc)); Faction defLocFaction = Board.getFactionAt(new FLocation(defenderLoc));
// for damage caused by projectiles, getDamager() returns the projectile... what we need to know is the source // for damage caused by projectiles, getDamager() returns the projectile... what we need to know is the source
if (damager instanceof Projectile) if (damager instanceof Projectile)
{
damager = ((Projectile)damager).getShooter(); damager = ((Projectile)damager).getShooter();
}
if (damager == damagee) // ender pearl usage and other self-inflicted damage
return true;
// Players can not take attack damage in a SafeZone, or possibly peaceful territory // Players can not take attack damage in a SafeZone, or possibly peaceful territory
if (defLocFaction.noPvPInTerritory()) { if (defLocFaction.noPvPInTerritory()) {
@ -306,16 +301,12 @@ public class FactionsEntityListener extends EntityListener
} }
if ( ! (damager instanceof Player)) if ( ! (damager instanceof Player))
{
return true; return true;
}
FPlayer attacker = FPlayers.i.get((Player)damager); FPlayer attacker = FPlayers.i.get((Player)damager);
if (attacker == null || attacker.getPlayer() == null) if (attacker == null || attacker.getPlayer() == null)
{
return true; return true;
}
if (attacker.hasLoginPvpDisabled()) if (attacker.hasLoginPvpDisabled())
{ {
@ -332,9 +323,7 @@ public class FactionsEntityListener extends EntityListener
return false; return false;
} }
else if (locFaction.isWarZone() && Conf.warZoneFriendlyFire) else if (locFaction.isWarZone() && Conf.warZoneFriendlyFire)
{
return true; return true;
}
Faction defendFaction = defender.getFaction(); Faction defendFaction = defender.getFaction();
Faction attackFaction = attacker.getFaction(); Faction attackFaction = attacker.getFaction();
@ -380,9 +369,7 @@ public class FactionsEntityListener extends EntityListener
// Players without faction may be hurt anywhere // Players without faction may be hurt anywhere
if (!defender.hasFaction()) if (!defender.hasFaction())
{
return true; return true;
}
// You can never hurt faction members or allies // You can never hurt faction members or allies
if (relation.isMember() || relation.isAlly()) if (relation.isMember() || relation.isAlly())