summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormd_5 <md_5@bigpond.com>2012-04-05 20:52:31 +1000
committermd_5 <md_5@bigpond.com>2012-04-05 20:52:31 +1000
commitea5081310779d4fa53bc9a99fb43354ad4d34887 (patch)
tree9383145a401803f50c35b98432053453c49f0b18
parent501e510cb34c768f4c6543e9636a10526d4af807 (diff)
downloadEssentials-ea5081310779d4fa53bc9a99fb43354ad4d34887.tar
Essentials-ea5081310779d4fa53bc9a99fb43354ad4d34887.tar.gz
Essentials-ea5081310779d4fa53bc9a99fb43354ad4d34887.tar.lz
Essentials-ea5081310779d4fa53bc9a99fb43354ad4d34887.tar.xz
Essentials-ea5081310779d4fa53bc9a99fb43354ad4d34887.zip
Negate some 1 class packages
-rw-r--r--EssentialsAntiCheat/src/com/earth2me/essentials/anticheat/LagMeasureTask.java (renamed from EssentialsAntiCheat/src/com/earth2me/essentials/anticheat/debug/LagMeasureTask.java)2
-rw-r--r--EssentialsAntiCheat/src/com/earth2me/essentials/anticheat/NoCheat.java1
-rw-r--r--EssentialsAntiCheat/src/com/earth2me/essentials/anticheat/NoCheatPlayerImpl.java (renamed from EssentialsAntiCheat/src/com/earth2me/essentials/anticheat/player/NoCheatPlayerImpl.java)14
-rw-r--r--EssentialsAntiCheat/src/com/earth2me/essentials/anticheat/data/PlayerManager.java2
4 files changed, 15 insertions, 4 deletions
diff --git a/EssentialsAntiCheat/src/com/earth2me/essentials/anticheat/debug/LagMeasureTask.java b/EssentialsAntiCheat/src/com/earth2me/essentials/anticheat/LagMeasureTask.java
index 4acb5a5f2..87fa7c0da 100644
--- a/EssentialsAntiCheat/src/com/earth2me/essentials/anticheat/debug/LagMeasureTask.java
+++ b/EssentialsAntiCheat/src/com/earth2me/essentials/anticheat/LagMeasureTask.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.anticheat.debug;
+package com.earth2me.essentials.anticheat;
import com.earth2me.essentials.anticheat.NoCheat;
import org.bukkit.World;
diff --git a/EssentialsAntiCheat/src/com/earth2me/essentials/anticheat/NoCheat.java b/EssentialsAntiCheat/src/com/earth2me/essentials/anticheat/NoCheat.java
index 5a05f78bc..ed5521a24 100644
--- a/EssentialsAntiCheat/src/com/earth2me/essentials/anticheat/NoCheat.java
+++ b/EssentialsAntiCheat/src/com/earth2me/essentials/anticheat/NoCheat.java
@@ -13,7 +13,6 @@ import com.earth2me.essentials.anticheat.config.ConfigurationCacheStore;
import com.earth2me.essentials.anticheat.config.ConfigurationManager;
import com.earth2me.essentials.anticheat.config.Permissions;
import com.earth2me.essentials.anticheat.data.PlayerManager;
-import com.earth2me.essentials.anticheat.debug.LagMeasureTask;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
diff --git a/EssentialsAntiCheat/src/com/earth2me/essentials/anticheat/player/NoCheatPlayerImpl.java b/EssentialsAntiCheat/src/com/earth2me/essentials/anticheat/NoCheatPlayerImpl.java
index 3417368ab..8fc81110a 100644
--- a/EssentialsAntiCheat/src/com/earth2me/essentials/anticheat/player/NoCheatPlayerImpl.java
+++ b/EssentialsAntiCheat/src/com/earth2me/essentials/anticheat/NoCheatPlayerImpl.java
@@ -1,4 +1,6 @@
-package com.earth2me.essentials.anticheat.player;
+package com.earth2me.essentials.anticheat;
+
+
import com.earth2me.essentials.anticheat.NoCheat;
import com.earth2me.essentials.anticheat.NoCheatPlayer;
@@ -38,41 +40,49 @@ public class NoCheatPlayerImpl implements NoCheatPlayer
this.config = plugin.getConfig(player);
}
+ @Override
public boolean isDead()
{
return this.player.getHealth() <= 0 || this.player.isDead();
}
+ @Override
public boolean hasPermission(String permission)
{
return player.hasPermission(permission);
}
+ @Override
public DataStore getDataStore()
{
return data;
}
+ @Override
public ConfigurationCacheStore getConfigurationStore()
{
return config;
}
+ @Override
public Player getPlayer()
{
return player;
}
+ @Override
public String getName()
{
return player.getName();
}
+ @Override
public int getTicksLived()
{
return player.getTicksLived();
}
+ @Override
public float getSpeedAmplifier()
{
EntityPlayer ep = ((CraftPlayer)player).getHandle();
@@ -111,6 +121,7 @@ public class NoCheatPlayerImpl implements NoCheatPlayer
}
}
+ @Override
public boolean isSprinting()
{
return player.isSprinting();
@@ -131,6 +142,7 @@ public class NoCheatPlayerImpl implements NoCheatPlayer
return lastUsedTime + 60000L < currentTimeInMilliseconds;
}
+ @Override
public boolean isCreative()
{
return player.getGameMode() == GameMode.CREATIVE || player.getAllowFlight();
diff --git a/EssentialsAntiCheat/src/com/earth2me/essentials/anticheat/data/PlayerManager.java b/EssentialsAntiCheat/src/com/earth2me/essentials/anticheat/data/PlayerManager.java
index 7a13628c6..28dcaacc4 100644
--- a/EssentialsAntiCheat/src/com/earth2me/essentials/anticheat/data/PlayerManager.java
+++ b/EssentialsAntiCheat/src/com/earth2me/essentials/anticheat/data/PlayerManager.java
@@ -2,7 +2,7 @@ package com.earth2me.essentials.anticheat.data;
import com.earth2me.essentials.anticheat.NoCheat;
import com.earth2me.essentials.anticheat.NoCheatPlayer;
-import com.earth2me.essentials.anticheat.player.NoCheatPlayerImpl;
+import com.earth2me.essentials.anticheat.NoCheatPlayerImpl;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;