mirror of
https://hub.spigotmc.org/stash/scm/spigot/craftbukkit.git
synced 2024-11-25 06:56:14 +00:00
26 lines
1.6 KiB
Diff
26 lines
1.6 KiB
Diff
--- a/net/minecraft/world/entity/animal/EntityOcelot.java
|
|
+++ b/net/minecraft/world/entity/animal/EntityOcelot.java
|
|
@@ -167,7 +167,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);
|
|
@@ -298,10 +298,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;
|
|
}
|
|
|