  
  public abstract class Entity implements ICommandSender
  {
-@@ -127,7 +124,7 @@ public abstract class Entity implements ICommandSender
+@@ -127,7 +123,7 @@ public abstract class Entity implements ICommandSender
      public float prevRotationPitch;
  
      /** Axis aligned bounding box. */

             this.movementInput.moveStrafe *= 0.2F;
             this.movementInput.moveForward *= 0.2F;
             this.sprintToggleTimer = 0;
@@ -1121,14 +1167,16 @@ public class EntityPlayerSP extends AbstractClientPlayer
         this.func_189810_i((float)(this.posX - d0), (float)(this.posZ - d1));
     }
 

     private boolean isOutsideBorder;
 
     /**
@@ -701,9 +697,15 @@ public abstract class Entity implements ICommandSender
      */
     public void moveEntity(double x, double y, double z)
     {
-        if (this.noClip)
+		// TODO: Client
+		// Enables NoClip.
+		if(this.noClip || ((WurstClient.INSTANCE.mods.phaseMod.isActive()
+			|| WurstClient.INSTANCE.mods.noClipMod.isActive())
+			&& this instanceof EntityPlayer))
 		{
-            this.setEntityBoundingBox(this.getEntityBoundingBox().offset(x, y, z));
+			
+			this.setEntityBoundingBox(
+				this.getEntityBoundingBox().offset(x, y, z));
 			this.resetPositionToBB();
 		}
         else
@@ -727,7 +729,12 @@ public abstract class Entity implements ICommandSender
             double d3 = x;
             double d4 = y;
             double d5 = z;
