diff --git a/patches/server/0104-Ridables.patch b/patches/server/0104-Ridables.patch index 9981d4744..1f42ac575 100644 --- a/patches/server/0104-Ridables.patch +++ b/patches/server/0104-Ridables.patch @@ -1675,7 +1675,7 @@ index 6506e0055..05e5fb07a 100644 } diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java -index 1be0f943b..8a8e74584 100644 +index 42145a89c..572ddd663 100644 --- a/src/main/java/net/minecraft/server/EntityRabbit.java +++ b/src/main/java/net/minecraft/server/EntityRabbit.java @@ -60,7 +60,7 @@ public class EntityRabbit extends EntityAnimal { @@ -1975,7 +1975,7 @@ index 5b519fa39..927d30825 100644 this.targetSelector.a(2, new PathfinderGoalOwnerHurtTarget(this)); this.targetSelector.a(3, (new PathfinderGoalHurtByTarget(this, new Class[0])).a(new Class[0])); // CraftBukkit - decompile error diff --git a/src/main/java/net/minecraft/server/EntityZoglin.java b/src/main/java/net/minecraft/server/EntityZoglin.java -index 28adbbebd..05ba24a3f 100644 +index 28adbbebd..c0b5476ff 100644 --- a/src/main/java/net/minecraft/server/EntityZoglin.java +++ b/src/main/java/net/minecraft/server/EntityZoglin.java @@ -21,6 +21,18 @@ public class EntityZoglin extends EntityMonster implements IMonster, IOglin { @@ -1997,15 +1997,19 @@ index 28adbbebd..05ba24a3f 100644 @Override protected BehaviorController.b cJ() { return BehaviorController.a((Collection) EntityZoglin.c, (Collection) EntityZoglin.b); -@@ -52,7 +64,7 @@ public class EntityZoglin extends EntityMonster implements IMonster, IOglin { +@@ -52,10 +64,10 @@ public class EntityZoglin extends EntityMonster implements IMonster, IOglin { } private Optional eP() { - return ((List) this.getBehaviorController().getMemory(MemoryModuleType.VISIBLE_MOBS).orElse(ImmutableList.of())).stream().filter(EntityZoglin::j).findFirst(); -+ return (this.getBehaviorController().getMemory(MemoryModuleType.VISIBLE_MOBS).orElse(ImmutableList.of())).stream().filter(EntityZoglin::j).findFirst(); // Purpur - decompile error ++ return (this.getBehaviorController().getMemory(MemoryModuleType.VISIBLE_MOBS).orElse(ImmutableList.of())).stream().filter(EntityZoglin::predicate).findFirst(); // Purpur - decompile error } - private static boolean j(EntityLiving entityliving) { +- private static boolean j(EntityLiving entityliving) { ++ private static boolean predicate(EntityLiving entityliving) { // Purpur - decompile error + EntityTypes entitytypes = entityliving.getEntityType(); + + return entitytypes != EntityTypes.ZOGLIN && entitytypes != EntityTypes.CREEPER && IEntitySelector.f.test(entityliving); @@ -130,14 +142,14 @@ public class EntityZoglin extends EntityMonster implements IMonster, IOglin { @Override