diff options
Diffstat (limited to 'patch-remap/og/net/minecraft/world/entity/animal/EntityOcelot.patch')
| -rw-r--r-- | patch-remap/og/net/minecraft/world/entity/animal/EntityOcelot.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/patch-remap/og/net/minecraft/world/entity/animal/EntityOcelot.patch b/patch-remap/og/net/minecraft/world/entity/animal/EntityOcelot.patch new file mode 100644 index 0000000000..e57d802e95 --- /dev/null +++ b/patch-remap/og/net/minecraft/world/entity/animal/EntityOcelot.patch @@ -0,0 +1,25 @@ +--- a/net/minecraft/world/entity/animal/EntityOcelot.java ++++ b/net/minecraft/world/entity/animal/EntityOcelot.java +@@ -179,7 +179,7 @@ + if ((this.temptGoal == null || this.temptGoal.isRunning()) && !this.isTrusting() && this.isFood(itemstack) && entityhuman.distanceToSqr((Entity) this) < 9.0D) { + this.usePlayerItem(entityhuman, enumhand, itemstack); + if (!this.level().isClientSide) { +- if (this.random.nextInt(3) == 0) { ++ if (this.random.nextInt(3) == 0 && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTameEvent(this, entityhuman).isCancelled()) { // CraftBukkit - added event call and isCancelled check + this.setTrusting(true); + this.spawnTrustingParticles(true); + this.level().broadcastEntityEvent(this, (byte) 41); +@@ -315,10 +315,10 @@ + private final EntityOcelot ocelot; + + public a(EntityOcelot entityocelot, Class<T> oclass, float f, double d0, double d1) { +- Predicate predicate = IEntitySelector.NO_CREATIVE_OR_SPECTATOR; ++ // Predicate predicate = IEntitySelector.NO_CREATIVE_OR_SPECTATOR; // CraftBukkit - decompile error + +- Objects.requireNonNull(predicate); +- super(entityocelot, oclass, f, d0, d1, predicate::test); ++ // Objects.requireNonNull(predicate); // CraftBukkit - decompile error ++ super(entityocelot, oclass, f, d0, d1, IEntitySelector.NO_CREATIVE_OR_SPECTATOR::test); // CraftBukkit - decompile error + this.ocelot = entityocelot; + } + |