TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-07-30 09:21:53 +00:00
Code Issues Projects Releases Wiki Activity

Reorganize entity listener

Browse source
This commit is contained in:
KHobbits 2012-12-30 03:31:05 +00:00
parent 9ecb501e00
commit a1b2773bf5
1 changed files with 22 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

48
Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java
View file

@ -30,44 +30,40 @@ public class EssentialsEntityListener implements Listener
{ {
final Entity eAttack = event.getDamager(); final Entity eAttack = event.getDamager();
final Entity eDefend = event.getEntity(); final Entity eDefend = event.getEntity();
if (eDefend instanceof Player && eAttack instanceof Player) if (eAttack instanceof Player)
{ {
final User defender = ess.getUser(eDefend);
final User attacker = ess.getUser(eAttack); final User attacker = ess.getUser(eAttack);
onPlayerVsPlayerDamage(event, defender, attacker); if (eDefend instanceof Player)
onPlayerVsPlayerPowertool(event, defender, attacker);
}
else if (eDefend instanceof Player && eAttack instanceof Projectile)
{
Entity shooter = ((Projectile)event.getDamager()).getShooter();
if (shooter instanceof Player)
{ {
final User defender = ess.getUser(eDefend); onPlayerVsPlayerDamage(event, (Player)eDefend, attacker);
final User attacker = ess.getUser(shooter);
onPlayerVsPlayerDamage(event, defender, attacker);
onPlayerVsPlayerPowertool(event, defender, attacker);
} }
} else if (eDefend instanceof Ageable)
else if (eAttack instanceof Player)
{
final User player = ess.getUser(eAttack);
player.updateActivity(true);
if (eDefend instanceof Ageable)
{ {
final ItemStack hand = player.getItemInHand(); final ItemStack hand = attacker.getItemInHand();
if (hand != null && hand.getType() == Material.MILK_BUCKET) if (hand != null && hand.getType() == Material.MILK_BUCKET)
{ {
((Ageable)eDefend).setBaby(); ((Ageable)eDefend).setBaby();
hand.setType(Material.BUCKET); hand.setType(Material.BUCKET);
player.setItemInHand(hand); attacker.setItemInHand(hand);
player.updateInventory(); attacker.updateInventory();
event.setCancelled(true); event.setCancelled(true);
} }
} }
attacker.updateActivity(true);
}
else if (eAttack instanceof Projectile && eDefend instanceof Player)
{
Entity shooter = ((Projectile)event.getDamager()).getShooter();
if (shooter instanceof Player)
{
final User attacker = ess.getUser(shooter);
onPlayerVsPlayerDamage(event, (Player)eDefend, attacker);
attacker.updateActivity(true);
}
} }
} }
private void onPlayerVsPlayerDamage(final EntityDamageByEntityEvent event, final User defender, final User attacker) private void onPlayerVsPlayerDamage(final EntityDamageByEntityEvent event, final Player defender, final User attacker)
{ {
if (ess.getSettings().getLoginAttackDelay() > 0 && !attacker.isAuthorized("essentials.pvpdelay.exempt") if (ess.getSettings().getLoginAttackDelay() > 0 && !attacker.isAuthorized("essentials.pvpdelay.exempt")
&& (System.currentTimeMillis() < (attacker.getLastLogin() + ess.getSettings().getLoginAttackDelay()))) && (System.currentTimeMillis() < (attacker.getLastLogin() + ess.getSettings().getLoginAttackDelay())))
@ -75,7 +71,7 @@ public class EssentialsEntityListener implements Listener
event.setCancelled(true); event.setCancelled(true);
} }
if (!attacker.equals(defender) && (attacker.hasInvulnerabilityAfterTeleport() || defender.hasInvulnerabilityAfterTeleport())) if (!defender.equals(attacker.getBase()) && (attacker.hasInvulnerabilityAfterTeleport() || ess.getUser(defender).hasInvulnerabilityAfterTeleport()))
{ {
event.setCancelled(true); event.setCancelled(true);
} }
@ -90,10 +86,10 @@ public class EssentialsEntityListener implements Listener
event.setCancelled(true); event.setCancelled(true);
} }
attacker.updateActivity(true); onPlayerVsPlayerPowertool(event, defender, attacker);
} }
private void onPlayerVsPlayerPowertool(final EntityDamageByEntityEvent event, final User defender, final User attacker) private void onPlayerVsPlayerPowertool(final EntityDamageByEntityEvent event, final Player defender, final User attacker)
{ {
final List<String> commandList = attacker.getPowertool(attacker.getItemInHand()); final List<String> commandList = attacker.getPowertool(attacker.getItemInHand());
if (commandList != null && !commandList.isEmpty()) if (commandList != null && !commandList.isEmpty())