--- a/net/minecraft/server/EntityFox.java
+++ b/net/minecraft/server/EntityFox.java
@@ -96,7 +96,7 @@
         this.goalSelector.a(10, new EntityFox.p());
         this.goalSelector.a(11, new EntityFox.j(this, EntityHuman.class, 24.0F));
         this.goalSelector.a(12, new EntityFox.r());
-        this.targetSelector.a(3, new EntityFox.a(EntityLiving.class, false, false, (entityliving) -> {
+        this.targetSelector.a(3, new EntityFox.a(EntityLiving.class, false, false, (entityliving) -> { // CraftBukkit - decompile error
             return EntityFox.bF.test(entityliving) && !this.c(entityliving.getUniqueID());
         }));
     }
@@ -260,15 +260,15 @@
         return EntityFox.Type.a((Integer) this.datawatcher.get(EntityFox.bz));
     }
 
-    private void a(EntityFox.Type entityfox_type) {
+    public void a(EntityFox.Type entityfox_type) { // PAIL
         this.datawatcher.set(EntityFox.bz, entityfox_type.c());
     }
 
     private List<UUID> ek() {
         List<UUID> list = Lists.newArrayList();
 
-        list.add(((Optional) this.datawatcher.get(EntityFox.bB)).orElse((Object) null));
-        list.add(((Optional) this.datawatcher.get(EntityFox.bD)).orElse((Object) null));
+        list.add((this.datawatcher.get(EntityFox.bB)).orElse(null)); // CraftBukkit - decompile error
+        list.add((this.datawatcher.get(EntityFox.bD)).orElse(null)); // CraftBukkit - decompile error
         return list;
     }
 
@@ -348,7 +348,7 @@
         return this.r(32);
     }
 
-    private void x(boolean flag) {
+    public void x(boolean flag) { // PAIL
         this.d(32, flag);
     }
 
@@ -983,7 +983,7 @@
         private int f;
 
         public r() {
-            super(null);
+            super(); // CraftBukkit - decompile error
             this.a(EnumSet.of(PathfinderGoal.Type.MOVE, PathfinderGoal.Type.LOOK));
         }
 
@@ -1035,7 +1035,7 @@
         private int c;
 
         public t() {
-            super(null);
+            super(); // CraftBukkit - decompile error
             this.c = EntityFox.this.random.nextInt(140);
             this.a(EnumSet.of(PathfinderGoal.Type.MOVE, PathfinderGoal.Type.LOOK, PathfinderGoal.Type.JUMP));
         }
@@ -1146,7 +1146,7 @@
         private EntityLiving k;
         private int l;
 
-        public a(Class oclass, boolean flag, boolean flag1, Predicate predicate) {
+        public a(Class oclass, boolean flag, boolean flag1, Predicate<EntityLiving> predicate) { // CraftBukkit - decompile error
             super(EntityFox.this, oclass, 10, flag, flag1, predicate);
         }