Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-09-06 21:18:03 +02:00
Code Issues Projects Releases Wiki Activity

Tidy up PVP attack delay.

Browse Source
This commit is contained in:
KHobbits 2012-05-22 21:02:28 +01:00
parent dc36a50d85
commit 7f5f6b6ac9
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,18 +32,18 @@ public class EssentialsEntityListener implements Listener
{
final User defender = ess.getUser(eDefend);
final User attacker = ess.getUser(eAttack);
if (!attacker.isAuthorized("essentials.pvpdelay.exempt") &&
System.currentTimeMillis() < (attacker.getLastLogin() + ess.getSettings().getLoginAttackDelay()))
if (ess.getSettings().getLoginAttackDelay() > 0 && !attacker.isAuthorized("essentials.pvpdelay.exempt")
&& (System.currentTimeMillis() < (attacker.getLastLogin() + ess.getSettings().getLoginAttackDelay())))
{
event.setCancelled(true);
}
if (attacker.hasInvulnerabilityAfterTeleport() || defender.hasInvulnerabilityAfterTeleport())
{
event.setCancelled(true);
}
attacker.updateActivity(true);
final List<String> commandList = attacker.getPowertool(attacker.getItemInHand());
if (commandList != null && !commandList.isEmpty())

5
Essentials/src/com/earth2me/essentials/Settings.java
View File

@ -388,6 +388,7 @@ public class Settings implements ISettings
cancelAfkOnMove = _cancelAfkOnMove();
getFreezeAfkPlayers = _getFreezeAfkPlayers();
itemSpawnBl = _getItemSpawnBlacklist();
loginAttackDelay = _loginAttackDelay();
kits = _getKits();
chatFormats.clear();
}
@ -805,6 +806,8 @@ public class Settings implements ISettings
return teleportInvulnerability;
}
private long loginAttackDelay;
private long _loginAttackDelay()
{
return config.getLong("login-attack-delay", 0) * 1000;
@ -813,7 +816,7 @@ public class Settings implements ISettings
@Override
public long getLoginAttackDelay()
{
return _loginAttackDelay();
return loginAttackDelay;
}
}