  .../command/server/CommandBlockLogic.java          |   2 +
  src/net/minecraft/crash/CrashReport.java           |  19 +-
  src/net/minecraft/crash/CrashReportCategory.java   |   3 +
- src/net/minecraft/entity/DataWatcher.java          |   3 +
+ src/net/minecraft/entity/DataWatcher.java          |  12 +-
  src/net/minecraft/entity/Entity.java               |  42 +-
  src/net/minecraft/entity/EntityLivingBase.java     |  14 +-
  src/net/minecraft/entity/EntityTracker.java        |   3 +

 import org.apache.commons.lang3.ObjectUtils;
 
 public class DataWatcher
diff --git a/src/net/minecraft/entity/Entity.java b/src/net/minecraft/entity/Entity.java
index 7397345..f610119 100644
--- a/src/net/minecraft/entity/Entity.java

 
 public class CrashReportCategory
diff --git a/src/net/minecraft/entity/DataWatcher.java b/src/net/minecraft/entity/DataWatcher.java
index 6b59121..b819849 100644
--- a/src/net/minecraft/entity/DataWatcher.java
+++ b/src/net/minecraft/entity/DataWatcher.java
@@ -2,6 +2,7 @@ package net.minecraft.entity;
