From bacaf7a224d511ac50da50c0d164e39161def4bc Mon Sep 17 00:00:00 2001
From: Evenprime <wilfried.pasquazzo@gmail.com>
Date: Tue, 31 Jan 2012 21:33:00 +0100
Subject: [PATCH] Some cleanup

---
 plugin.yml                                                | 8 +++-----
 pom.xml                                                   | 4 ++--
 .../bukkit/nocheat/checks/moving/RunningCheck.java        | 2 +-
 .../co/evenprime/bukkit/nocheat/config/Permissions.java   | 1 +
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/plugin.yml b/plugin.yml
index 67072dcc..3042a4b1 100644
--- a/plugin.yml
+++ b/plugin.yml
@@ -25,14 +25,14 @@ permissions:
         description: Give a player all admin rights
         children:
           nocheat.admin.chatlog:
-            description: Show log messages in the players chat
+            description: Player can see NoCheats log messages in the ingame chat
           nocheat.admin.commands:
-            description: allow use of all of the "nocheat" commands
+            description: allow use of the "nocheat" commands
       nocheat.checks:
         description: Allow the player to bypass all checks
         children:
           nocheat.checks.moving: 
-            description: Allow the player to bypass all moving checks
+            description: Allow the player to bypass all moving related checks
             children:
               nocheat.checks.moving.runfly:
                 description: Allow a player to move as free and as fast as he wants (ignores flying, swimming and sneaking settings)
@@ -69,8 +69,6 @@ permissions:
                 description: Allow a player to send an infinite amount of chat messages
               nocheat.checks.chat.color:
                 description: Allow a player to send colored chat messages
-              nocheat.checks.chat.empty:
-                description: Allow a player to send empty messages (normally not possible)
           nocheat.checks.fight:
             description: Allow the player to bypass all fight checks
             children:
diff --git a/pom.xml b/pom.xml
index 6d5e3c69..61a09a11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>cc.co.evenprime.bukkit</groupId>
 	<artifactId>NoCheat</artifactId>
-	<version>2.25</version>
+	<version>2.26</version>
 	<packaging>jar</packaging>
 	<name>NoCheat</name>
 	<properties>
@@ -13,7 +13,7 @@
 		<dependency>
 			<groupId>org.bukkit</groupId>
 			<artifactId>craftbukkit</artifactId>
-			<version>1.1-R2-SNAPSHOT</version>
+			<version>1.1-R4-SNAPSHOT</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/src/cc/co/evenprime/bukkit/nocheat/checks/moving/RunningCheck.java b/src/cc/co/evenprime/bukkit/nocheat/checks/moving/RunningCheck.java
index c1e3a13a..d2d31e04 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/checks/moving/RunningCheck.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/checks/moving/RunningCheck.java
@@ -156,7 +156,7 @@ public class RunningCheck extends MovingCheck {
         if(cc.sneakingCheck && player.getPlayer().isSneaking() && !player.hasPermission(Permissions.MOVING_SNEAKING)) {
             limit = cc.sneakingSpeedLimit;
             suffix = "sneaking";
-        } else if(isSwimming) {
+        } else if(isSwimming && !player.hasPermission(Permissions.MOVING_SWIMMING)) {
             limit = cc.swimmingSpeedLimit;
             suffix = "swimming";
         } else if(!sprinting) {
diff --git a/src/cc/co/evenprime/bukkit/nocheat/config/Permissions.java b/src/cc/co/evenprime/bukkit/nocheat/config/Permissions.java
index 43b846dc..e9851dd2 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/config/Permissions.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/config/Permissions.java
@@ -12,6 +12,7 @@ public class Permissions {
 
     public final static String  MOVING               = CHECKS + ".moving";
     public final static String  MOVING_RUNFLY        = MOVING + ".runfly";
+    public static final String  MOVING_SWIMMING      = MOVING + ".swimming";
     public final static String  MOVING_SNEAKING      = MOVING + ".sneaking";
     public final static String  MOVING_FLYING        = MOVING + ".flying";
     public final static String  MOVING_NOFALL        = MOVING + ".nofall";