TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-12 12:23:59 +00:00
Code Issues Projects Releases Wiki Activity

Entity event cleanup

Browse source
This commit is contained in:
KHobbits 2012-03-02 16:54:12 +00:00
parent 7737d19c5a
commit 25ebe68389
1 changed files with 42 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -24,25 +24,20 @@ public class EssentialsEntityListener implements Listener
} }
@EventHandler(priority = EventPriority.LOWEST) @EventHandler(priority = EventPriority.LOWEST)
public void onEntityDamage(EntityDamageEvent event) public void onEntityDamage(final EntityDamageByEntityEvent event)
{ {
if (event instanceof EntityDamageByEntityEvent) final Entity eAttack = event.getDamager();
{ final Entity eDefend = event.getEntity();
EntityDamageByEntityEvent edEvent = (EntityDamageByEntityEvent)event;
Entity eAttack = edEvent.getDamager();
Entity eDefend = edEvent.getEntity();
if (eDefend instanceof Player && eAttack instanceof Player) if (eDefend instanceof Player && eAttack instanceof Player)
{ {
User defender = ess.getUser(eDefend); final User defender = ess.getUser(eDefend);
User attacker = ess.getUser(eAttack); final User attacker = ess.getUser(eAttack);
attacker.updateActivity(true); attacker.updateActivity(true);
ItemStack is = attacker.getItemInHand(); final List<String> commandList = attacker.getPowertool(attacker.getItemInHand());
List<String> commandList = attacker.getPowertool(is);
if (commandList != null && !commandList.isEmpty()) if (commandList != null && !commandList.isEmpty())
{ {
for (String command : commandList) for (String command : commandList)
{ {
if (command != null && !command.isEmpty()) if (command != null && !command.isEmpty())
{ {
attacker.getServer().dispatchCommand(attacker, command.replaceAll("\\{player\\}", defender.getName())); attacker.getServer().dispatchCommand(attacker, command.replaceAll("\\{player\\}", defender.getName()));
@ -52,10 +47,10 @@ public class EssentialsEntityListener implements Listener
} }
} }
} }
if (eDefend instanceof Animals && eAttack instanceof Player) else if (eDefend instanceof Animals && eAttack instanceof Player)
{ {
User player = ess.getUser(eAttack); final User player = ess.getUser(eAttack);
ItemStack hand = player.getItemInHand(); final ItemStack hand = player.getItemInHand();
if (hand != null && hand.getType() == Material.MILK_BUCKET) if (hand != null && hand.getType() == Material.MILK_BUCKET)
{ {
((Animals)eDefend).setAge(-24000); ((Animals)eDefend).setAge(-24000);
@ -66,6 +61,10 @@ public class EssentialsEntityListener implements Listener
} }
} }
} }
@EventHandler(priority = EventPriority.LOWEST)
public void onEntityDamage(final EntityDamageEvent event)
{
if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled()) if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled())
{ {
final Player player = (Player)event.getEntity(); final Player player = (Player)event.getEntity();
@ -76,7 +75,7 @@ public class EssentialsEntityListener implements Listener
} }
@EventHandler(priority = EventPriority.LOWEST) @EventHandler(priority = EventPriority.LOWEST)
public void onEntityCombust(EntityCombustEvent event) public void onEntityCombust(final EntityCombustEvent event)
{ {
if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled()) if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled())
{ {
@ -85,12 +84,9 @@ public class EssentialsEntityListener implements Listener
} }
@EventHandler(priority = EventPriority.LOWEST) @EventHandler(priority = EventPriority.LOWEST)
public void onEntityDeath(final EntityDeathEvent event) public void onPlayerDeathEvent(final PlayerDeathEvent event)
{ {
if (event instanceof PlayerDeathEvent) final User user = ess.getUser(event.getEntity());
{
final PlayerDeathEvent pdevent = (PlayerDeathEvent)event;
final User user = ess.getUser(pdevent.getEntity());
if (user.isAuthorized("essentials.back.ondeath") && !ess.getSettings().isCommandDisabled("back")) if (user.isAuthorized("essentials.back.ondeath") && !ess.getSettings().isCommandDisabled("back"))
{ {
user.setLastLocation(); user.setLastLocation();
@ -98,13 +94,12 @@ public class EssentialsEntityListener implements Listener
} }
if (!ess.getSettings().areDeathMessagesEnabled()) if (!ess.getSettings().areDeathMessagesEnabled())
{ {
pdevent.setDeathMessage(""); event.setDeathMessage("");
}
} }
} }
@EventHandler(priority = EventPriority.LOWEST) @EventHandler(priority = EventPriority.LOWEST)
public void onFoodLevelChange(FoodLevelChangeEvent event) public void onFoodLevelChange(final FoodLevelChangeEvent event)
{ {
if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled()) if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled())
{ {
@ -113,7 +108,7 @@ public class EssentialsEntityListener implements Listener
} }
@EventHandler(priority = EventPriority.LOWEST) @EventHandler(priority = EventPriority.LOWEST)
public void onEntityRegainHealth(EntityRegainHealthEvent event) public void onEntityRegainHealth(final EntityRegainHealthEvent event)
{ {
if (event.getRegainReason() == RegainReason.SATIATED && event.getEntity() instanceof Player if (event.getRegainReason() == RegainReason.SATIATED && event.getEntity() instanceof Player
&& ess.getUser(event.getEntity()).isAfk() && ess.getSettings().getFreezeAfkPlayers()) && ess.getUser(event.getEntity()).isAfk() && ess.getSettings().getFreezeAfkPlayers())