--- a/net/minecraft/server/EntityParrot.java +++ b/net/minecraft/server/EntityParrot.java @@ -20,7 +20,7 @@ }; private static final Item bw = Items.COOKIE; private static final Set<Item> bx = Sets.newHashSet(new Item[]{Items.WHEAT_SEEDS, Items.MELON_SEEDS, Items.PUMPKIN_SEEDS, Items.BEETROOT_SEEDS}); - private static final Map<EntityTypes<?>, SoundEffect> by = (Map) SystemUtils.a((Object) Maps.newHashMap(), (hashmap) -> { + private static final Map<EntityTypes<?>, SoundEffect> by = (Map) SystemUtils.a(Maps.newHashMap(), (hashmap) -> { // CraftBukkit - decompile error hashmap.put(EntityTypes.BLAZE, SoundEffects.ENTITY_PARROT_IMITATE_BLAZE); hashmap.put(EntityTypes.CAVE_SPIDER, SoundEffects.ENTITY_PARROT_IMITATE_SPIDER); hashmap.put(EntityTypes.CREEPER, SoundEffects.ENTITY_PARROT_IMITATE_CREEPER); @@ -187,7 +187,7 @@ } if (!this.world.isClientSide) { - if (this.random.nextInt(10) == 0) { + if (this.random.nextInt(10) == 0 && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTameEvent(this, entityhuman).isCancelled()) { // CraftBukkit this.tame(entityhuman); this.world.broadcastEntityEffect(this, (byte) 7); } else { @@ -201,7 +201,7 @@ itemstack.subtract(1); } - this.addEffect(new MobEffect(MobEffects.POISON, 900)); + this.addEffect(new MobEffect(MobEffects.POISON, 900), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.FOOD); // CraftBukkit if (entityhuman.isCreative() || !this.isInvulnerable()) { this.damageEntity(DamageSource.playerAttack(entityhuman), Float.MAX_VALUE); } @@ -315,7 +315,7 @@ @Override public boolean isCollidable() { - return true; + return super.isCollidable(); // CraftBukkit - collidable API } @Override @@ -330,7 +330,7 @@ if (this.isInvulnerable(damagesource)) { return false; } else { - this.setWillSit(false); + // this.setWillSit(false); // CraftBukkit - moved into EntityLiving.damageEntity(DamageSource, float) return super.damageEntity(damagesource, f); } }