      private boolean isOutsideBorder;
  
      /**
-@@ -687,9 +683,21 @@ public abstract class Entity implements ICommandSender
+@@ -687,9 +684,17 @@ public abstract class Entity implements ICommandSender
       */
      public void moveEntity(double x, double y, double z)
      {
 -        if (this.noClip)
--        {
--            this.setEntityBoundingBox(this.getEntityBoundingBox().offset(x, y, z));
 +		// TODO: Client
 +		// Enables NoClip.
-+		boolean freecamActive = WurstClient.INSTANCE.mods.freecamMod.isActive();
-+		if(this.noClip
-+			|| ((freecamActive || WurstClient.INSTANCE.mods.phaseMod.isActive() || WurstClient.INSTANCE.mods.noClipMod
-+				.isActive()) && this instanceof EntityPlayer))
-+		{
-+			// Fixes Freecam flight speed
-+			if(this == Minecraft.getMinecraft().thePlayer && freecamActive)
-+				this.setEntityBoundingBox(this.getEntityBoundingBox().offset(
-+					x * 10, y, z * 10));
-+			else
-+				this.setEntityBoundingBox(this.getEntityBoundingBox().offset(x,
-+					y, z));
++		if(this instanceof EntityPlayerSP)
++			EventFactory.onPlayerMove((EntityPlayerSP)this);
++		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.resetPositionToBB();
-         }
++			this.setEntityBoundingBox(
++				this.getEntityBoundingBox().offset(x, y, z));
+ 			this.resetPositionToBB();
+ 		}
          else
-@@ -713,7 +721,12 @@ public abstract class Entity implements ICommandSender
+@@ -713,7 +718,12 @@ public abstract class Entity implements ICommandSender
              double d3 = x;
              double d4 = y;
              double d5 = z;

 net/minecraft/util/text/ITextComponent.java        |  12 ++
 net/minecraft/util/text/Style.java                 |   6 +
 net/minecraft/world/World.java                     |  41 ++--
 111 files changed, 1670 insertions(+), 772 deletions(-)

diff --git a/Start.java b/Start.java
index ae0025f..078afa5 100644

 net/minecraft/crash/CrashReport.java               |  62 +++++-
 net/minecraft/crash/CrashReportCategory.java       |  10 +-
 net/minecraft/enchantment/Enchantment.java         |   4 +
 net/minecraft/entity/Entity.java                   |  63 +++---
 net/minecraft/entity/EntityAreaEffectCloud.java    |   6 +-
 net/minecraft/entity/EntityLivingBase.java         | 110 +++++-----
 net/minecraft/entity/EntityTrackerEntry.java       |   4 +-
