2019-04-23 04:00:00 +02:00
|
|
|
--- a/net/minecraft/server/EntityCat.java
|
|
|
|
|
+++ b/net/minecraft/server/EntityCat.java
|
|
|
|
|
@@ -16,7 +16,7 @@
|
2019-06-21 12:00:00 +02:00
|
|
|
private static final DataWatcherObject<Boolean> bF = DataWatcher.a(EntityCat.class, DataWatcherRegistry.i);
|
2019-04-23 04:00:00 +02:00
|
|
|
private static final DataWatcherObject<Boolean> bG = DataWatcher.a(EntityCat.class, DataWatcherRegistry.i);
|
2019-06-21 12:00:00 +02:00
|
|
|
private static final DataWatcherObject<Integer> bH = DataWatcher.a(EntityCat.class, DataWatcherRegistry.b);
|
|
|
|
|
- public static final Map<Integer, MinecraftKey> bC = (Map) SystemUtils.a((Object) Maps.newHashMap(), (hashmap) -> {
|
|
|
|
|
+ public static final Map<Integer, MinecraftKey> bC = (Map) SystemUtils.a(Maps.newHashMap(), (hashmap) -> { // CraftBukkit - decompile error
|
2019-04-23 04:00:00 +02:00
|
|
|
hashmap.put(0, new MinecraftKey("textures/entity/cat/tabby.png"));
|
|
|
|
|
hashmap.put(1, new MinecraftKey("textures/entity/cat/black.png"));
|
|
|
|
|
hashmap.put(2, new MinecraftKey("textures/entity/cat/red.png"));
|
2019-05-19 04:02:25 +02:00
|
|
|
@@ -329,7 +329,7 @@
|
|
|
|
|
} else if (this.i(itemstack)) {
|
|
|
|
|
this.a(entityhuman, itemstack);
|
|
|
|
|
if (!this.world.isClientSide) {
|
|
|
|
|
- if (this.random.nextInt(3) == 0) {
|
|
|
|
|
+ if (this.random.nextInt(3) == 0 && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTameEvent(this, entityhuman).isCancelled()) { // CraftBukkit
|
|
|
|
|
this.tame(entityhuman);
|
|
|
|
|
this.r(true);
|
|
|
|
|
this.goalSit.setSitting(true);
|
2019-04-23 04:00:00 +02:00
|
|
|
@@ -518,7 +518,7 @@
|
|
|
|
|
static class PathfinderGoalTemptChance extends PathfinderGoalTempt {
|
|
|
|
|
|
|
|
|
|
@Nullable
|
|
|
|
|
- private EntityHuman chosenTarget;
|
|
|
|
|
+ private EntityLiving chosenTarget; // CraftBukkit
|
|
|
|
|
private final EntityCat d;
|
|
|
|
|
|
|
|
|
|
public PathfinderGoalTemptChance(EntityCat entitycat, double d0, RecipeItemStack recipeitemstack, boolean flag) {
|
|
|
|
|
@@ -553,9 +553,9 @@
|
|
|
|
|
private final EntityCat i;
|
|
|
|
|
|
|
|
|
|
public a(EntityCat entitycat, Class<T> oclass, float f, double d0, double d1) {
|
|
|
|
|
- Predicate predicate = IEntitySelector.e;
|
|
|
|
|
+ // Predicate predicate = IEntitySelector.e; // CraftBukkit - decompile error
|
|
|
|
|
|
|
|
|
|
- super(entitycat, oclass, f, d0, d1, predicate::test);
|
|
|
|
|
+ super(entitycat, oclass, f, d0, d1, IEntitySelector.e::test); // CraftBukkit - decompile error
|
|
|
|
|
this.i = entitycat;
|
|
|
|
|
}
|
|
|
|
|
|
