Shuffle code.

src/fr/neatmonster/nocheatplus/utilities/BlockProperties.java

@@ -1071,5 +1071,60 @@ public class BlockProperties {
         }
         return false;
     }
+
+    /**
+     * Check if a move determined by xDistance and zDistance is leading dowm stream.
+     * @param access
+     * @param x
+     * @param y
+     * @param z
+     * @param data
+     * @param dX
+     * @param dZ
+     * @return
+     */
+    public static final boolean isDownStream(final IBlockAccess access, final int x, final int y, final int z, final int data, 
+            final double dX, final double dZ) {
+        // x > 0 -> south, z > 0 -> west
+        if ((data & 0x8) == 0){
+            // not falling.
+            if ((dX > 0)){
+                if (data < 7 && BlockProperties.isLiquid(access.getTypeId(x + 1, y, z)) && access.getData(x + 1, y, z) > data){
+                    return true;
+                }
+                else if (data > 0  && BlockProperties.isLiquid(access.getTypeId(x - 1, y, z)) && access.getData(x - 1, y, z) < data){
+                    // reverse direction.
+                    return true;
+                }
+            } else if (dX < 0){
+                if (data < 7 && BlockProperties.isLiquid(access.getTypeId(x - 1, y, z)) && access.getData(x - 1, y, z) > data){
+                    return true;
+                }
+                else if (data > 0  && BlockProperties.isLiquid(access.getTypeId(x + 1, y, z)) && access.getData(x + 1, y, z) < data){
+                    // reverse direction.
+                    return true;
+                }
+            }
+            if (dZ > 0){
+                if (data < 7 && BlockProperties.isLiquid(access.getTypeId(x, y, z + 1)) && access.getData(x, y, z + 1) > data){
+                    return true;
+                }
+                else if (data > 0  && BlockProperties.isLiquid(access.getTypeId(x , y, z - 1)) && access.getData(x, y, z - 1) < data){
+                    // reverse direction.
+                    return true;
+                }
+            }
+            else if (dZ < 0 ){
+                if (data < 7 && BlockProperties.isLiquid(access.getTypeId(x, y, z - 1)) && access.getData(x, y, z - 1) > data){
+                    return true;
+                }
+                else if (data > 0  && BlockProperties.isLiquid(access.getTypeId(x , y, z + 1)) && access.getData(x, y, z + 1) < data){
+                    // reverse direction.
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
 	
 }

src/fr/neatmonster/nocheatplus/utilities/PlayerLocation.java

@@ -72,16 +72,10 @@ public class PlayerLocation {
     
     /** Simple test if the exact position is passable. */
     private Boolean                 passable;
-
-    /** The bounding box of the player. */
-    private AxisAlignedBB           boundingBox;
     
     /** Y parameter for growing the bounding box with the isOnGround check.*/
     private double yOnGround = 0.001;
 
-    /** The entity player. */
-    private EntityPlayer            entity;
-
     /** The  block coordinates. */
     private int                     blockX, blockY, blockZ;
     
@@ -89,6 +83,14 @@ public class PlayerLocation {
     private double x,y,z;
     
     private float yaw, pitch;
+    
+    // Members that need cleanup:
+    
+    /** The entity player. */
+    private EntityPlayer            entity;
+    
+    /** The bounding box of the player. */
+    private AxisAlignedBB           boundingBox;
 
     /** Bukkit world. */
     private World                   world;
@@ -96,6 +98,7 @@ public class PlayerLocation {
     /** The worldServer. */
     private WorldServer             worldServer;
     
+    /** Optional block property cache. */
     private BlockCache blockCache;
 
     /**
@@ -152,6 +155,14 @@ public class PlayerLocation {
         return pitch;
     }
     
+    public Vector getVector() {
+        return new Vector(x, y, z);
+    }
+    
+    public double getWidth(){
+        return entity.width;
+    }
+    
     public int getBlockX(){
         return blockX;
     }
@@ -163,6 +174,11 @@ public class PlayerLocation {
     public int getBlockZ(){
         return blockZ;
     }
+    
+    public final boolean isSameBlock(final PlayerLocation other) {
+        // Maybe make block coordinate fields later.
+        return blockX == other.getBlockX() && blockZ == other.getBlockZ() &&  blockY == other.getBlockY();
+    }
 
     /**
      * Checks if the player is above stairs.
@@ -213,6 +229,47 @@ public class PlayerLocation {
         // TODO: optimize (check liquid first and only if liquid check further)
         return isInLava() || isInWater();
     }
+    
+
+    /**
+     * Checks if the player is on ice.
+     * 
+     * @return true, if the player is on ice
+     */
+    public boolean isOnIce() {
+        if (onIce == null){
+            final org.bukkit.entity.Player entity = this.entity.getBukkitEntity();
+            if (entity.isSneaking() || entity.isBlocking())
+                onIce = getTypeId(blockX, Location.locToBlock(boundingBox.b - 0.1D), blockZ) == Material.ICE.getId();
+            else
+                onIce = getTypeIdBelow().intValue() == Material.ICE.getId();
+        }
+        return onIce;
+    }
+
+    /**
+     * Checks if the player is on a ladder or vine.
+     * 
+     * @return If so.
+     */
+    public boolean isOnLadder() {
+        if (onLadder == null){
+            final int typeId = getTypeId();
+            onLadder = typeId == Material.LADDER.getId() || typeId == Material.VINE.getId();
+        }
+        return onLadder;
+    }
+    
+    /**
+     * Checks if the player is above a ladder or vine.<br>
+     * Does not save back value to field.
+     * 
+     * @return If so.
+     */
+    public boolean isAboveLadder() {
+        final int typeId = getTypeIdBelow();
+        return typeId == Material.LADDER.getId() || typeId == Material.VINE.getId();
+    }
 
     /**
      * Checks if the player is in web.
@@ -274,45 +331,14 @@ public class PlayerLocation {
         }
         return onGround;
     }
-
-    /**
-     * Checks if the player is on ice.
-     * 
-     * @return true, if the player is on ice
-     */
-    public boolean isOnIce() {
-        if (onIce == null){
-            final org.bukkit.entity.Player entity = this.entity.getBukkitEntity();
-            if (entity.isSneaking() || entity.isBlocking())
-                onIce = getTypeId(blockX, Location.locToBlock(boundingBox.b - 0.1D), blockZ) == Material.ICE.getId();
-            else
-                onIce = getTypeIdBelow().intValue() == Material.ICE.getId();
-        }
-        return onIce;
-    }
-
-    /**
-     * Checks if the player is on a ladder or vine.
-     * 
-     * @return If so.
-     */
-    public boolean isOnLadder() {
-        if (onLadder == null){
-        	final int typeId = getTypeId();
-        	onLadder = typeId == Material.LADDER.getId() || typeId == Material.VINE.getId();
-        }
-        return onLadder;
-    }
     
-    /**
+    public double getyOnGround() {
-     * Checks if the player is above a ladder or vine.<br>
+        return yOnGround;
-     * Does not save back value to field.
+    }
-     * 
+
-     * @return If so.
+    public void setyOnGround(final double yOnGround) {
-     */
+        this.yOnGround = yOnGround;
-    public boolean isAboveLadder() {
+        this.onGround = null;
-        final int typeId = getTypeIdBelow();
-        return typeId == Material.LADDER.getId() || typeId == Material.VINE.getId();
     }
     
     /**
@@ -325,17 +351,85 @@ public class PlayerLocation {
     }
     
     /**
-     * Sets the player location object.
+     * Convenience method: delegate to BlockProperties.isDoppwnStream .
-     * 
+     * @param xDistance
-     * @param location
+     * @param zDistance
-     *            the location
+     * @return
-     * @param player
-     *            the player
      */
-    public void set(final Location location, final Player player){
+    public boolean isDownStream(final double xDistance, final double zDistance){
-    	set(location, player, 0.001);
+        return BlockProperties.isDownStream(getBlockAccess(), blockX, blockY, blockZ, getData(), xDistance, zDistance);
     }
 
+	public Integer getTypeId() {
+		if (typeId == null) typeId = getTypeId(blockX, blockY, blockZ);
+		return typeId;
+	}
+
+
+	public Integer getTypeIdBelow() {
+		if (typeIdBelow == null) typeIdBelow = getTypeId(blockX, blockY - 1, blockZ);
+		return typeIdBelow;
+	}
+	
+	public Integer getData(){
+	    if (data == null) data = getData(blockX, blockY, blockZ);
+	    return data;
+	}
+	
+	/**
+	 * Uses id cache if present.
+	 * @param x
+	 * @param y
+	 * @param z
+	 * @return
+	 */
+	public final int getTypeId(final int x, final int y, final int z){
+	    return blockCache == null ? worldServer.getTypeId(x, y, z) : blockCache.getTypeId(x, y, z);
+	}
+
+	/**
+	 * Uses id cache if present.
+	 * @param x
+	 * @param y
+	 * @param z
+	 * @return
+	 */
+    public final int getData(final int x, final int y, final int z){
+        return blockCache == null ? worldServer.getData(x, y, z) : blockCache.getData(x, y, z);
+    }
+    
+    public WorldServer getWorldServer() {
+        return worldServer;
+    }
+    
+    /**
+     * Set the id cache for faster id getting.
+     * @param cache
+     */
+     public void setBlockCache(final BlockCache cache) {
+         this.blockCache = cache;
+     }
+        
+    /**
+    *
+    * @return
+    */
+   public final IBlockAccess getBlockAccess() {
+       return blockCache == null ? worldServer : blockCache;
+   }
+   
+   /**
+    * Sets the player location object.
+    * 
+    * @param location
+    *            the location
+    * @param player
+    *            the player
+    */
+   public void set(final Location location, final Player player){
+       set(location, player, 0.001);
+   }
+    
     /**
      * Sets the player location object. Does not set or reset blockCache.
      * 
@@ -379,130 +473,4 @@ public class PlayerLocation {
         blockCache = null;
     }
 
-	public double getyOnGround() {
-		return yOnGround;
-	}
-
-	public void setyOnGround(final double yOnGround) {
-		this.yOnGround = yOnGround;
-		this.onGround = null;
-	}
-
-	public Integer getTypeId() {
-		if (typeId == null) typeId = getTypeId(blockX, blockY, blockZ);
-		return typeId;
-	}
-
-
-	public Integer getTypeIdBelow() {
-		if (typeIdBelow == null) typeIdBelow = getTypeId(blockX, blockY - 1, blockZ);
-		return typeIdBelow;
-	}
-	
-	public Integer getData(){
-	    if (data == null) data = getData(blockX, blockY, blockZ);
-	    return data;
-	}
-	
-	public boolean isDownStream(final double xDistance, final double zDistance){
-        // x > 0 -> south, z > 0 -> west
-        final int fromData = getData();
-        
-        if ((fromData & 0x8) == 0){
-            // not falling.
-            if ((xDistance > 0)){
-                if (fromData < 7 && BlockProperties.isLiquid(getTypeId(blockX + 1, blockY, blockZ)) && getData(blockX + 1, blockY, blockZ) > fromData){
-                    return true;
-                }
-                else if (fromData > 0  && BlockProperties.isLiquid(getTypeId(blockX - 1, blockY, blockZ)) && getData(blockX - 1, blockY, blockZ) < fromData){
-                    // reverse direction.
-                    return true;
-                }
-            } else if (xDistance < 0){
-                if (fromData < 7 && BlockProperties.isLiquid(getTypeId(blockX - 1, blockY, blockZ)) && getData(blockX - 1, blockY, blockZ) > fromData){
-                    return true;
-                }
-                else if (fromData > 0  && BlockProperties.isLiquid(getTypeId(blockX + 1, blockY, blockZ)) && getData(blockX + 1, blockY, blockZ) < fromData){
-                    // reverse direction.
-                    return true;
-                }
-            }
-            if (zDistance > 0){
-                if (fromData < 7 && BlockProperties.isLiquid(getTypeId(blockX, blockY, blockZ + 1)) && getData(blockX, blockY, blockZ + 1) > fromData){
-                    return true;
-                }
-                else if (fromData > 0  && BlockProperties.isLiquid(getTypeId(blockX , blockY, blockZ - 1)) && getData(blockX, blockY, blockZ - 1) < fromData){
-                    // reverse direction.
-                    return true;
-                }
-            }
-            else if (zDistance < 0 ){
-                if (fromData < 7 && BlockProperties.isLiquid(getTypeId(blockX, blockY, blockZ - 1)) && getData(blockX, blockY, blockZ - 1) > fromData){
-                    return true;
-                }
-                else if (fromData > 0  && BlockProperties.isLiquid(getTypeId(blockX , blockY, blockZ + 1)) && getData(blockX, blockY, blockZ + 1) < fromData){
-                    // reverse direction.
-                    return true;
-                }
-            }
-        }
-	    return false;
-	}
-
-	public final boolean isSameBlock(final PlayerLocation other) {
-		// Maybe make block coordinate fields later.
-		return blockX == other.getBlockX() && blockZ == other.getBlockZ() &&  blockY == other.getBlockY();
-	}
-	
-	/**
-	 * Uses id cache if present.
-	 * @param x
-	 * @param y
-	 * @param z
-	 * @return
-	 */
-	public final int getTypeId(final int x, final int y, final int z){
-	    return blockCache == null ? worldServer.getTypeId(x, y, z) : blockCache.getTypeId(x, y, z);
-	}
-
-	/**
-	 * Uses id cache if present.
-	 * @param x
-	 * @param y
-	 * @param z
-	 * @return
-	 */
-    public final int getData(final int x, final int y, final int z){
-        return blockCache == null ? worldServer.getData(x, y, z) : blockCache.getData(x, y, z);
-    }
-	   
-	/**
-	 *
-	 * @return
-	 */
-	public final IBlockAccess getBlockAccess() {
-		return blockCache == null ? worldServer : blockCache;
-	}
-	
-	   /**
-     * Set the id cache for faster id getting.
-     * @param cache
-     */
-    public void setBlockCache(final BlockCache cache) {
-        this.blockCache = cache;
-    }
-	
-
-    public WorldServer getWorldServer() {
-        return worldServer;
-    }
-
-    public Vector getVector() {
-        return new Vector(x, y, z);
-    }
-    
-    public double getWidth(){
-        return entity.width;
-    }
-
 }