Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-01-20 07:01:41 +01:00
Code Issues Projects Releases Wiki Activity

Minor entity optimization.

Browse Source
This commit is contained in:
KHobbits 2013-02-11 23:33:30 +00:00
parent c298fb9332
commit c3f0d34293
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java
View File

@ -4,6 +4,7 @@ import static com.earth2me.essentials.I18n._;
import java.util.List; import java.util.List;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.regex.Pattern;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.*; import org.bukkit.entity.*;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
@ -18,6 +19,7 @@ public class EssentialsEntityListener implements Listener
{ {
private static final Logger LOGGER = Logger.getLogger("Minecraft"); private static final Logger LOGGER = Logger.getLogger("Minecraft");
private final IEssentials ess; private final IEssentials ess;
private static final transient Pattern powertoolPlayer = Pattern.compile("\\{player\\}");
public EssentialsEntityListener(IEssentials ess) public EssentialsEntityListener(IEssentials ess)
{ {
@ -65,8 +67,9 @@ public class EssentialsEntityListener implements Listener
private void onPlayerVsPlayerDamage(final EntityDamageByEntityEvent event, final Player 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
&& (System.currentTimeMillis() < (attacker.getLastLogin() + ess.getSettings().getLoginAttackDelay()))) && (System.currentTimeMillis() < (attacker.getLastLogin() + ess.getSettings().getLoginAttackDelay()))
&& !attacker.isAuthorized("essentials.pvpdelay.exempt"))
{ {
event.setCancelled(true); event.setCancelled(true);
} }
@ -96,7 +99,7 @@ public class EssentialsEntityListener implements Listener
{ {
for (final String tempCommand : commandList) for (final String tempCommand : commandList)
{ {
final String command = tempCommand.replaceAll("\\{player\\}", defender.getName()); final String command = powertoolPlayer.matcher(tempCommand).replaceAll(defender.getName());
if (command != null && !command.isEmpty() && !command.equals(tempCommand)) if (command != null && !command.isEmpty() && !command.equals(tempCommand))
{ {
ess.scheduleSyncDelayedTask( ess.scheduleSyncDelayedTask(