Repackage patches

By: md_5 <git@md-5.net>
2021-03-16 09:00:00 +11:00
parent 2777f7b780
commit 18496e998f
433 changed files with 0 additions and 0 deletions
--- a/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityAnimal.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityAnimal.patch
@@ -0,0 +1,98 @@
+--- a/net/minecraft/server/EntityAnimal.java
+++ b/net/minecraft/server/EntityAnimal.java
+@@ -4,10 +4,16 @@
+ import java.util.UUID;
+ import javax.annotation.Nullable;
+ 
+// CraftBukkit start
+import org.bukkit.craftbukkit.event.CraftEventFactory;
+import org.bukkit.event.entity.EntityEnterLoveModeEvent;
+// CraftBukkit end
+
+ public abstract class EntityAnimal extends EntityAgeable {
+ 
+     public int loveTicks;
+     public UUID breedCause;
+    public ItemStack breedItem; // CraftBukkit - Add breedItem variable
+ 
+     protected EntityAnimal(EntityTypes<? extends EntityAnimal> entitytypes, World world) {
+         super(entitytypes, world);
+@@ -44,6 +50,9 @@
+ 
+     }
+ 
+    /* CraftBukkit start
+    // Function disabled as it has no special function anymore after
+    // setSitting is disabled.
+     @Override
+     public boolean damageEntity(DamageSource damagesource, float f) {
+         if (this.isInvulnerable(damagesource)) {
+@@ -53,6 +62,7 @@
+             return super.damageEntity(damagesource, f);
+         }
+     }
+    // CraftBukkit end */
+ 
+     @Override
+     public float a(BlockPosition blockposition, IWorldReader iworldreader) {
+@@ -143,10 +153,17 @@
+     }
+ 
+     public void g(@Nullable EntityHuman entityhuman) {
+-        this.loveTicks = 600;
+        // CraftBukkit start
+        EntityEnterLoveModeEvent entityEnterLoveModeEvent = CraftEventFactory.callEntityEnterLoveModeEvent(entityhuman, this, 600);
+        if (entityEnterLoveModeEvent.isCancelled()) {
+            return;
+        }
+        this.loveTicks = entityEnterLoveModeEvent.getTicksInLove();
+        // CraftBukkit end
+         if (entityhuman != null) {
+             this.breedCause = entityhuman.getUniqueID();
+         }
+        this.breedItem = entityhuman.inventory.getItemInHand(); // CraftBukkit
+ 
+         this.world.broadcastEntityEffect(this, (byte) 18);
+     }
+@@ -186,11 +203,24 @@
+         EntityAgeable entityageable = this.createChild(worldserver, entityanimal);
+ 
+         if (entityageable != null) {
+            // CraftBukkit start - set persistence for tame animals
+            if (entityageable instanceof EntityTameableAnimal && ((EntityTameableAnimal) entityageable).isTamed()) {
+                entityageable.persistent = true;
+            }
+            // CraftBukkit end
+             EntityPlayer entityplayer = this.getBreedCause();
+ 
+             if (entityplayer == null && entityanimal.getBreedCause() != null) {
+                 entityplayer = entityanimal.getBreedCause();
+             }
+            // CraftBukkit start - call EntityBreedEvent
+            int experience = this.getRandom().nextInt(7) + 1;
+            org.bukkit.event.entity.EntityBreedEvent entityBreedEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityBreedEvent(entityageable, this, entityanimal, entityplayer, this.breedItem, experience);
+            if (entityBreedEvent.isCancelled()) {
+                return;
+            }
+            experience = entityBreedEvent.getExperience();
+            // CraftBukkit end
+ 
+             if (entityplayer != null) {
+                 entityplayer.a(StatisticList.ANIMALS_BRED);
+@@ -203,10 +233,14 @@
+             entityanimal.resetLove();
+             entityageable.setBaby(true);
+             entityageable.setPositionRotation(this.locX(), this.locY(), this.locZ(), 0.0F, 0.0F);
+-            worldserver.addAllEntities(entityageable);
+            worldserver.addAllEntities(entityageable, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.BREEDING); // CraftBukkit - added SpawnReason
+             worldserver.broadcastEntityEffect(this, (byte) 18);
+             if (worldserver.getGameRules().getBoolean(GameRules.DO_MOB_LOOT)) {
+-                worldserver.addEntity(new EntityExperienceOrb(worldserver, this.locX(), this.locY(), this.locZ(), this.getRandom().nextInt(7) + 1));
+                // CraftBukkit start - use event experience
+                if (experience > 0) {
+                    worldserver.addEntity(new EntityExperienceOrb(worldserver, this.locX(), this.locY(), this.locZ(), experience));
+                }
+                // CraftBukkit end
+             }
+ 
+         }
--- a/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityBee.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityBee.patch
@@ -0,0 +1,101 @@
+--- a/net/minecraft/server/EntityBee.java
+++ b/net/minecraft/server/EntityBee.java
+@@ -137,7 +137,7 @@
+                 }
+ 
+                 if (b0 > 0) {
+-                    ((EntityLiving) entity).addEffect(new MobEffect(MobEffects.POISON, b0 * 20, 0));
+                    ((EntityLiving) entity).addEffect(new MobEffect(MobEffects.POISON, b0 * 20, 0), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.ATTACK); // CraftBukkit
+                 }
+             }
+ 
+@@ -512,11 +512,15 @@
+         } else {
+             Entity entity = damagesource.getEntity();
+ 
+-            if (!this.world.isClientSide) {
+            // CraftBukkit start
+            boolean result = super.damageEntity(damagesource, f);
+
+            if (result && !this.world.isClientSide) {
+                 this.bC.l();
+             }
+ 
+-            return super.damageEntity(damagesource, f);
+            return result;
+            // CraftBukkit end
+         }
+     }
+ 
+@@ -537,7 +541,7 @@
+     class d extends EntityBee.a {
+ 
+         private d() {
+-            super(null);
+            super(); // CraftBukkit - decompile error
+         }
+ 
+         @Override
+@@ -597,7 +601,7 @@
+     class g extends EntityBee.a {
+ 
+         private g() {
+-            super(null);
+            super(); // CraftBukkit - decompile error
+         }
+ 
+         @Override
+@@ -646,7 +650,7 @@
+                             }
+                         }
+ 
+-                        if (flag) {
+                        if (flag && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(EntityBee.this, blockposition, iblockdata.set(blockstateinteger, (Integer) iblockdata.get(blockstateinteger) + 1)).isCancelled()) { // Spigot
+                             EntityBee.this.world.triggerEffect(2005, blockposition, 0);
+                             EntityBee.this.world.setTypeUpdate(blockposition, (IBlockData) iblockdata.set(blockstateinteger, (Integer) iblockdata.get(blockstateinteger) + 1));
+                             EntityBee.this.fi();
+@@ -661,7 +665,7 @@
+     class i extends EntityBee.a {
+ 
+         private i() {
+-            super(null);
+            super(); // CraftBukkit - decompile error
+         }
+ 
+         @Override
+@@ -725,7 +729,7 @@
+         private int h = 0;
+ 
+         k() {
+-            super(null);
+            super(); // CraftBukkit - decompile error
+             this.a(EnumSet.of(PathfinderGoal.Type.MOVE));
+         }
+ 
+@@ -909,7 +913,7 @@
+         private int c;
+ 
+         f() {
+-            super(null);
+            super(); // CraftBukkit - decompile error
+             this.c = EntityBee.this.world.random.nextInt(10);
+             this.a(EnumSet.of(PathfinderGoal.Type.MOVE));
+         }
+@@ -967,7 +971,7 @@
+         private int f;
+ 
+         e() {
+-            super(null);
+            super(); // CraftBukkit - decompile error
+             this.c = EntityBee.this.world.random.nextInt(10);
+             this.d = Lists.newArrayList();
+             this.e = null;
+@@ -1187,7 +1191,7 @@
+         @Override
+         protected void a(EntityInsentient entityinsentient, EntityLiving entityliving) {
+             if (entityinsentient instanceof EntityBee && this.e.hasLineOfSight(entityliving)) {
+-                entityinsentient.setGoalTarget(entityliving);
+                entityinsentient.setGoalTarget(entityliving, org.bukkit.event.entity.EntityTargetEvent.TargetReason.TARGET_ATTACKED_ENTITY, true); // CraftBukkit - reason
+             }
+ 
+         }
--- a/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityCat.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityCat.patch
@@ -0,0 +1,58 @@
+--- a/net/minecraft/server/EntityCat.java
+++ b/net/minecraft/server/EntityCat.java
+@@ -15,7 +15,7 @@
+     private static final DataWatcherObject<Boolean> bt = DataWatcher.a(EntityCat.class, DataWatcherRegistry.i);
+     private static final DataWatcherObject<Boolean> bu = DataWatcher.a(EntityCat.class, DataWatcherRegistry.i);
+     private static final DataWatcherObject<Integer> bv = DataWatcher.a(EntityCat.class, DataWatcherRegistry.b);
+-    public static final Map<Integer, MinecraftKey> bq = (Map) SystemUtils.a((Object) Maps.newHashMap(), (hashmap) -> {
+    public static final Map<Integer, MinecraftKey> bq = (Map) SystemUtils.a(Maps.newHashMap(), (hashmap) -> { // CraftBukkit - decompile error
+         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"));
+@@ -341,7 +341,7 @@
+                 }
+             } else if (this.k(itemstack)) {
+                 this.a(entityhuman, itemstack);
+-                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.setWillSit(true);
+                     this.world.broadcastEntityEffect(this, (byte) 7);
+@@ -499,7 +499,15 @@
+             while (iterator.hasNext()) {
+                 ItemStack itemstack = (ItemStack) iterator.next();
+ 
+-                this.a.world.addEntity(new EntityItem(this.a.world, (double) blockposition_mutableblockposition.getX() - (double) MathHelper.sin(this.a.aA * 0.017453292F), (double) blockposition_mutableblockposition.getY(), (double) blockposition_mutableblockposition.getZ() + (double) MathHelper.cos(this.a.aA * 0.017453292F), itemstack));
+                // CraftBukkit start
+                EntityItem entityitem = new EntityItem(this.a.world, (double) blockposition_mutableblockposition.getX() - (double) MathHelper.sin(this.a.aA * 0.017453292F), (double) blockposition_mutableblockposition.getY(), (double) blockposition_mutableblockposition.getZ() + (double) MathHelper.cos(this.a.aA * 0.017453292F), itemstack);
+                org.bukkit.event.entity.EntityDropItemEvent event = new org.bukkit.event.entity.EntityDropItemEvent(this.a.getBukkitEntity(), (org.bukkit.entity.Item) entityitem.getBukkitEntity());
+                entityitem.world.getServer().getPluginManager().callEvent(event);
+                if (event.isCancelled()) {
+                    continue;
+                }
+                this.a.world.addEntity(entityitem);
+                // CraftBukkit end
+             }
+ 
+         }
+@@ -529,7 +537,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) {
+@@ -564,9 +572,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;
+         }
+ 
--- a/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityChicken.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityChicken.patch
@@ -0,0 +1,24 @@
+--- a/net/minecraft/server/EntityChicken.java
+++ b/net/minecraft/server/EntityChicken.java
+@@ -40,6 +40,11 @@
+ 
+     @Override
+     public void movementTick() {
+        // CraftBukkit start
+        if (this.isChickenJockey()) {
+            this.persistent = !this.isTypeNotPersistent(0);
+        }
+        // CraftBukkit end
+         super.movementTick();
+         this.br = this.bo;
+         this.bq = this.bp;
+@@ -59,7 +64,9 @@
+         this.bo += this.bs * 2.0F;
+         if (!this.world.isClientSide && this.isAlive() && !this.isBaby() && !this.isChickenJockey() && --this.eggLayTime <= 0) {
+             this.playSound(SoundEffects.ENTITY_CHICKEN_EGG, 1.0F, (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F);
+            this.forceDrops = true; // CraftBukkit
+             this.a((IMaterial) Items.EGG);
+            this.forceDrops = false; // CraftBukkit
+             this.eggLayTime = this.random.nextInt(6000) + 6000;
+         }
+ 
--- a/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityCow.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityCow.patch
@@ -0,0 +1,31 @@
+--- a/net/minecraft/server/EntityCow.java
+++ b/net/minecraft/server/EntityCow.java
+@@ -1,5 +1,10 @@
+ package net.minecraft.server;
+ 
+// CraftBukkit start
+import org.bukkit.craftbukkit.event.CraftEventFactory;
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
+// CraftBukkit end
+
+ public class EntityCow extends EntityAnimal {
+ 
+     public EntityCow(EntityTypes<? extends EntityCow> entitytypes, World world) {
+@@ -52,8 +57,16 @@
+         ItemStack itemstack = entityhuman.b(enumhand);
+ 
+         if (itemstack.getItem() == Items.BUCKET && !this.isBaby()) {
+            // CraftBukkit start - Got milk?
+            org.bukkit.event.player.PlayerBucketFillEvent event = CraftEventFactory.callPlayerBucketFillEvent((WorldServer) entityhuman.world, entityhuman, this.getChunkCoordinates(), this.getChunkCoordinates(), null, itemstack, Items.MILK_BUCKET);
+
+            if (event.isCancelled()) {
+                return EnumInteractionResult.PASS;
+            }
+            // CraftBukkit end
+
+             entityhuman.playSound(SoundEffects.ENTITY_COW_MILK, 1.0F, 1.0F);
+-            ItemStack itemstack1 = ItemLiquidUtil.a(itemstack, entityhuman, Items.MILK_BUCKET.createItemStack());
+            ItemStack itemstack1 = ItemLiquidUtil.a(itemstack, entityhuman, CraftItemStack.asNMSCopy(event.getItemStack())); // CraftBukkit
+ 
+             entityhuman.a(enumhand, itemstack1);
+             return EnumInteractionResult.a(this.world.isClientSide);
--- a/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityDolphin.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityDolphin.patch
@@ -0,0 +1,51 @@
+--- a/net/minecraft/server/EntityDolphin.java
+++ b/net/minecraft/server/EntityDolphin.java
+@@ -109,7 +109,7 @@
+         this.goalSelector.a(8, new EntityDolphin.d());
+         this.goalSelector.a(8, new PathfinderGoalFollowBoat(this));
+         this.goalSelector.a(9, new PathfinderGoalAvoidTarget<>(this, EntityGuardian.class, 8.0F, 1.0D, 1.0D));
+-        this.targetSelector.a(1, (new PathfinderGoalHurtByTarget(this, new Class[]{EntityGuardian.class})).a());
+        this.targetSelector.a(1, (new PathfinderGoalHurtByTarget(this, new Class[]{EntityGuardian.class})).a(new Class[0])); // CraftBukkit - decompile error
+     }
+ 
+     public static AttributeProvider.Builder eM() {
+@@ -176,6 +176,12 @@
+             ItemStack itemstack = entityitem.getItemStack();
+ 
+             if (this.canPickup(itemstack)) {
+                // CraftBukkit start - call EntityPickupItemEvent
+                if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityPickupItemEvent(this, entityitem, 0, false).isCancelled()) {
+                    return;
+                }
+                itemstack = entityitem.getItemStack(); // update ItemStack from event
+                // CraftBukkit end
+                 this.a(entityitem);
+                 this.setSlot(EnumItemSlot.MAINHAND, itemstack);
+                 this.dropChanceHand[EnumItemSlot.MAINHAND.b()] = 2.0F;
+@@ -323,7 +329,7 @@
+ 
+         @Override
+         public boolean a() {
+-            return this.a.gotFish() && this.a.getAirTicks() >= 100;
+            return this.a.gotFish() && this.a.getAirTicks() >= 100 && this.a.world.getWorld().canGenerateStructures(); // MC-151364, SPIGOT-5494: hangs if generate-structures=false
+         }
+ 
+         @Override
+@@ -432,7 +438,7 @@
+ 
+         @Override
+         public void c() {
+-            this.c.addEffect(new MobEffect(MobEffects.DOLPHINS_GRACE, 100));
+            this.c.addEffect(new MobEffect(MobEffects.DOLPHINS_GRACE, 100), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.DOLPHIN); // CraftBukkit
+         }
+ 
+         @Override
+@@ -451,7 +457,7 @@
+             }
+ 
+             if (this.c.isSwimming() && this.c.world.random.nextInt(6) == 0) {
+-                this.c.addEffect(new MobEffect(MobEffects.DOLPHINS_GRACE, 100));
+                this.c.addEffect(new MobEffect(MobEffects.DOLPHINS_GRACE, 100), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.DOLPHIN); // CraftBukkit
+             }
+ 
+         }
--- a/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityFish.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityFish.patch
@@ -0,0 +1,19 @@
+--- a/net/minecraft/server/EntityFish.java
+++ b/net/minecraft/server/EntityFish.java
+@@ -32,7 +32,7 @@
+ 
+     @Override
+     public boolean isTypeNotPersistent(double d0) {
+-        return !this.isFromBucket() && !this.hasCustomName();
+        return true; // CraftBukkit
+     }
+ 
+     @Override
+@@ -52,6 +52,7 @@
+ 
+     public void setFromBucket(boolean flag) {
+         this.datawatcher.set(EntityFish.FROM_BUCKET, flag);
+        this.persistent = this.isPersistent(); // CraftBukkit - SPIGOT-4106 update persistence
+     }
+ 
+     @Override
--- a/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityFox.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityFox.patch
@@ -0,0 +1,94 @@
+--- a/net/minecraft/server/EntityFox.java
+++ b/net/minecraft/server/EntityFox.java
+@@ -264,8 +264,8 @@
+     private List<UUID> fa() {
+         List<UUID> list = Lists.newArrayList();
+ 
+-        list.add(((Optional) this.datawatcher.get(EntityFox.FIRST_TRUSTED_PLAYER)).orElse((Object) null));
+-        list.add(((Optional) this.datawatcher.get(EntityFox.SECOND_TRUSTED_PLAYER)).orElse((Object) null));
+        list.add((this.datawatcher.get(EntityFox.FIRST_TRUSTED_PLAYER)).orElse(null)); // CraftBukkit - decompile error
+        list.add((this.datawatcher.get(EntityFox.SECOND_TRUSTED_PLAYER)).orElse(null)); // CraftBukkit - decompile error
+         return list;
+     }
+ 
+@@ -401,7 +401,8 @@
+     protected void b(EntityItem entityitem) {
+         ItemStack itemstack = entityitem.getItemStack();
+ 
+-        if (this.canPickup(itemstack)) {
+        if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityPickupItemEvent(this, entityitem, itemstack.getCount() - 1, !this.canPickup(itemstack)).isCancelled()) { // CraftBukkit - call EntityPickupItemEvent
+            itemstack = entityitem.getItemStack(); // CraftBukkit - update ItemStack from event
+             int i = itemstack.getCount();
+ 
+             if (i > 1) {
+@@ -923,6 +924,11 @@
+                     int i = (Integer) iblockdata.get(BlockSweetBerryBush.a);
+ 
+                     iblockdata.set(BlockSweetBerryBush.a, 1);
+                    // CraftBukkit start - call EntityChangeBlockEvent
+                    if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(EntityFox.this, this.e, iblockdata.set(BlockSweetBerryBush.a, 1)).isCancelled()) {
+                        return;
+                    }
+                    // CraftBukkit end
+                     int j = 1 + EntityFox.this.world.random.nextInt(2) + (i == 3 ? 1 : 0);
+                     ItemStack itemstack = EntityFox.this.getEquipment(EnumItemSlot.MAINHAND);
+ 
+@@ -962,7 +968,7 @@
+         private int f;
+ 
+         public r() {
+-            super(null);
+            super(); // CraftBukkit - decompile error
+             this.a(EnumSet.of(PathfinderGoal.Type.MOVE, PathfinderGoal.Type.LOOK));
+         }
+ 
+@@ -1014,7 +1020,7 @@
+         private int c;
+ 
+         public t() {
+-            super(null);
+            super(); // CraftBukkit - decompile error
+             this.c = EntityFox.this.random.nextInt(140);
+             this.a(EnumSet.of(PathfinderGoal.Type.MOVE, PathfinderGoal.Type.LOOK, PathfinderGoal.Type.JUMP));
+         }
+@@ -1125,7 +1131,7 @@
+         private EntityLiving k;
+         private int l;
+ 
+-        public a(Class oclass, boolean flag, boolean flag1, Predicate predicate) {
+        public a(Class oclass, boolean flag, boolean flag1, Predicate<EntityLiving> predicate) { // CraftBukkit - decompile error
+             super(EntityFox.this, oclass, 10, flag, flag1, predicate);
+         }
+ 
+@@ -1205,6 +1211,14 @@
+                 if (entityplayer1 != null && entityplayer != entityplayer1) {
+                     entityfox.b(entityplayer1.getUniqueID());
+                 }
+                // CraftBukkit start - call EntityBreedEvent
+                int experience = this.animal.getRandom().nextInt(7) + 1;
+                org.bukkit.event.entity.EntityBreedEvent entityBreedEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityBreedEvent(entityfox, animal, partner, entityplayer, this.animal.breedItem, experience);
+                if (entityBreedEvent.isCancelled()) {
+                    return;
+                }
+                experience = entityBreedEvent.getExperience();
+                // CraftBukkit end
+ 
+                 if (entityplayer2 != null) {
+                     entityplayer2.a(StatisticList.ANIMALS_BRED);
+@@ -1217,10 +1231,14 @@
+                 this.partner.resetLove();
+                 entityfox.setAgeRaw(-24000);
+                 entityfox.setPositionRotation(this.animal.locX(), this.animal.locY(), this.animal.locZ(), 0.0F, 0.0F);
+-                worldserver.addAllEntities(entityfox);
+                worldserver.addAllEntities(entityfox, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.BREEDING); // CraftBukkit - added SpawnReason
+                 this.b.broadcastEntityEffect(this.animal, (byte) 18);
+                 if (this.b.getGameRules().getBoolean(GameRules.DO_MOB_LOOT)) {
+-                    this.b.addEntity(new EntityExperienceOrb(this.b, this.animal.locX(), this.animal.locY(), this.animal.locZ(), this.animal.getRandom().nextInt(7) + 1));
+                    // CraftBukkit start - use event experience
+                    if (experience > 0) {
+                        this.b.addEntity(new EntityExperienceOrb(this.b, this.animal.locX(), this.animal.locY(), this.animal.locZ(), experience));
+                    }
+                    // CraftBukkit end
+                 }
+ 
+             }
--- a/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityIronGolem.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityIronGolem.patch
@@ -0,0 +1,11 @@
+--- a/net/minecraft/server/EntityIronGolem.java
+++ b/net/minecraft/server/EntityIronGolem.java
+@@ -58,7 +58,7 @@
+     @Override
+     protected void C(Entity entity) {
+         if (entity instanceof IMonster && !(entity instanceof EntityCreeper) && this.getRandom().nextInt(20) == 0) {
+-            this.setGoalTarget((EntityLiving) entity);
+            this.setGoalTarget((EntityLiving) entity, org.bukkit.event.entity.EntityTargetLivingEntityEvent.TargetReason.COLLISION, true); // CraftBukkit - set reason
+         }
+ 
+         super.C(entity);
--- a/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityMushroomCow.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityMushroomCow.patch
@@ -0,0 +1,51 @@
+--- a/net/minecraft/server/EntityMushroomCow.java
+++ b/net/minecraft/server/EntityMushroomCow.java
+@@ -5,6 +5,11 @@
+ import java.util.UUID;
+ import org.apache.commons.lang3.tuple.Pair;
+ 
+// CraftBukkit start
+import org.bukkit.craftbukkit.event.CraftEventFactory;
+import org.bukkit.event.entity.EntityTransformEvent;
+// CraftBukkit end
+
+ public class EntityMushroomCow extends EntityCow implements IShearable {
+ 
+     private static final DataWatcherObject<String> bo = DataWatcher.a(EntityMushroomCow.class, DataWatcherRegistry.d);
+@@ -75,6 +80,11 @@
+             this.playSound(soundeffect, 1.0F, 1.0F);
+             return EnumInteractionResult.a(this.world.isClientSide);
+         } else if (itemstack.getItem() == Items.SHEARS && this.canShear()) {
+            // CraftBukkit start
+            if (!CraftEventFactory.handlePlayerShearEntityEvent(entityhuman, this, itemstack, enumhand)) {
+                return EnumInteractionResult.PASS;
+            }
+            // CraftBukkit end
+             this.shear(SoundCategory.PLAYERS);
+             if (!this.world.isClientSide) {
+                 itemstack.damage(1, entityhuman, (entityhuman1) -> {
+@@ -121,7 +131,7 @@
+         this.world.playSound((EntityHuman) null, (Entity) this, SoundEffects.ENTITY_MOOSHROOM_SHEAR, soundcategory, 1.0F, 1.0F);
+         if (!this.world.s_()) {
+             ((WorldServer) this.world).a(Particles.EXPLOSION, this.locX(), this.e(0.5D), this.locZ(), 1, 0.0D, 0.0D, 0.0D, 0.0D);
+-            this.die();
+            // this.die(); // CraftBukkit - moved down
+             EntityCow entitycow = (EntityCow) EntityTypes.COW.a(this.world);
+ 
+             entitycow.setPositionRotation(this.locX(), this.locY(), this.locZ(), this.yaw, this.pitch);
+@@ -137,7 +147,14 @@
+             }
+ 
+             entitycow.setInvulnerable(this.isInvulnerable());
+-            this.world.addEntity(entitycow);
+            // CraftBukkit start
+            if (CraftEventFactory.callEntityTransformEvent(this, entitycow, EntityTransformEvent.TransformReason.SHEARED).isCancelled()) {
+                return;
+            }
+            this.world.addEntity(entitycow, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SHEARED);
+
+            this.die(); // CraftBukkit - from above
+            // CraftBukkit end
+ 
+             for (int i = 0; i < 5; ++i) {
+                 this.world.addEntity(new EntityItem(this.world, this.locX(), this.e(1.0D), this.locZ(), new ItemStack(this.getVariant().d.getBlock())));
--- a/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityOcelot.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityOcelot.patch
@@ -0,0 +1,33 @@
+--- a/net/minecraft/server/EntityOcelot.java
+++ b/net/minecraft/server/EntityOcelot.java
+@@ -81,7 +81,7 @@
+ 
+     @Override
+     public boolean isTypeNotPersistent(double d0) {
+-        return !this.isTrusting() && this.ticksLived > 2400;
+        return !this.isTrusting() /*&& this.ticksLived > 2400*/; // CraftBukkit
+     }
+ 
+     public static AttributeProvider.Builder eK() {
+@@ -135,7 +135,8 @@
+         if ((this.br == null || this.br.h()) && !this.isTrusting() && this.k(itemstack) && entityhuman.h((Entity) this) < 9.0D) {
+             this.a(entityhuman, itemstack);
+             if (!this.world.isClientSide) {
+-                if (this.random.nextInt(3) == 0) {
+                // CraftBukkit - added event call and isCancelled check
+                if (this.random.nextInt(3) == 0 && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTameEvent(this, entityhuman).isCancelled()) {
+                     this.setTrusting(true);
+                     this.u(true);
+                     this.world.broadcastEntityEffect(this, (byte) 41);
+@@ -243,9 +244,9 @@
+         private final EntityOcelot i;
+ 
+         public a(EntityOcelot entityocelot, Class<T> oclass, float f, double d0, double d1) {
+-            Predicate predicate = IEntitySelector.e;
+            // Predicate predicate = IEntitySelector.e; // CraftBukkit - decompile error
+ 
+-            super(entityocelot, oclass, f, d0, d1, predicate::test);
+            super(entityocelot, oclass, f, d0, d1, IEntitySelector.e::test); // CraftBukkit - decompile error
+             this.i = entityocelot;
+         }
+ 
--- a/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityPanda.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityPanda.patch
@@ -0,0 +1,41 @@
+--- a/net/minecraft/server/EntityPanda.java
+++ b/net/minecraft/server/EntityPanda.java
+@@ -9,6 +9,8 @@
+ import java.util.function.Predicate;
+ import javax.annotation.Nullable;
+ 
+import org.bukkit.event.entity.EntityTargetEvent; // CraftBukkit
+
+ public class EntityPanda extends EntityAnimal {
+ 
+     private static final DataWatcherObject<Integer> bp = DataWatcher.a(EntityPanda.class, DataWatcherRegistry.b);
+@@ -445,7 +447,7 @@
+ 
+     @Override
+     protected void b(EntityItem entityitem) {
+-        if (this.getEquipment(EnumItemSlot.MAINHAND).isEmpty() && EntityPanda.PICKUP_PREDICATE.test(entityitem)) {
+        if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityPickupItemEvent(this, entityitem, 0, !(this.getEquipment(EnumItemSlot.MAINHAND).isEmpty() && EntityPanda.PICKUP_PREDICATE.test(entityitem))).isCancelled()) { // CraftBukkit
+             this.a(entityitem);
+             ItemStack itemstack = entityitem.getItemStack();
+ 
+@@ -666,7 +668,7 @@
+         @Override
+         protected void a(EntityInsentient entityinsentient, EntityLiving entityliving) {
+             if (entityinsentient instanceof EntityPanda && ((EntityPanda) entityinsentient).isAggressive()) {
+-                entityinsentient.setGoalTarget(entityliving);
+                entityinsentient.setGoalTarget(entityliving, EntityTargetEvent.TargetReason.TARGET_ATTACKED_ENTITY, true); // CraftBukkit
+             }
+ 
+         }
+@@ -770,9 +772,9 @@
+         private final EntityPanda i;
+ 
+         public c(EntityPanda entitypanda, Class<T> oclass, float f, double d0, double d1) {
+-            Predicate predicate = IEntitySelector.g;
+            // Predicate predicate = IEntitySelector.g; // CraftBukkit - decompile error
+ 
+-            super(entitypanda, oclass, f, d0, d1, predicate::test);
+            super(entitypanda, oclass, f, d0, d1, IEntitySelector.g::test); // CraftBukkit - decompile error
+             this.i = entitypanda;
+         }
+ 
--- a/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityParrot.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityParrot.patch
@@ -0,0 +1,47 @@
+--- 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);
+         }
+     }
--- a/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityPig.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityPig.patch
@@ -0,0 +1,28 @@
+--- a/net/minecraft/server/EntityPig.java
+++ b/net/minecraft/server/EntityPig.java
+@@ -3,6 +3,10 @@
+ import com.google.common.collect.UnmodifiableIterator;
+ import javax.annotation.Nullable;
+ 
+// CraftBukkit start
+import org.bukkit.craftbukkit.event.CraftEventFactory;
+// CraftBukkit end
+
+ public class EntityPig extends EntityAnimal implements ISteerable, ISaddleable {
+ 
+     private static final DataWatcherObject<Boolean> bo = DataWatcher.a(EntityPig.class, DataWatcherRegistry.i);
+@@ -204,7 +208,13 @@
+             }
+ 
+             entitypigzombie.setPersistent();
+-            worldserver.addEntity(entitypigzombie);
+            // CraftBukkit start
+            if (CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) {
+                return;
+            }
+            // CraftBukkit - added a reason for spawning this creature
+            worldserver.addEntity(entitypigzombie, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.LIGHTNING);
+            // CraftBukkit end
+             this.die();
+         } else {
+             super.onLightningStrike(worldserver, entitylightning);
--- a/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityPufferFish.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityPufferFish.patch
@@ -0,0 +1,20 @@
+--- a/net/minecraft/server/EntityPufferFish.java
+++ b/net/minecraft/server/EntityPufferFish.java
+@@ -114,7 +114,7 @@
+         int i = this.getPuffState();
+ 
+         if (entityinsentient.damageEntity(DamageSource.mobAttack(this), (float) (1 + i))) {
+-            entityinsentient.addEffect(new MobEffect(MobEffects.POISON, 60 * i, 0));
+            entityinsentient.addEffect(new MobEffect(MobEffects.POISON, 60 * i, 0), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.ATTACK); // CraftBukkit
+             this.playSound(SoundEffects.ENTITY_PUFFER_FISH_STING, 1.0F, 1.0F);
+         }
+ 
+@@ -129,7 +129,7 @@
+                 ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.j, 0.0F));
+             }
+ 
+-            entityhuman.addEffect(new MobEffect(MobEffects.POISON, 60 * i, 0));
+            entityhuman.addEffect(new MobEffect(MobEffects.POISON, 60 * i, 0), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.ATTACK); // CraftBukkit
+         }
+ 
+     }
--- a/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityRabbit.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityRabbit.patch
@@ -0,0 +1,50 @@
+--- a/net/minecraft/server/EntityRabbit.java
+++ b/net/minecraft/server/EntityRabbit.java
+@@ -17,8 +17,14 @@
+         super(entitytypes, world);
+         this.bi = new EntityRabbit.ControllerJumpRabbit(this);
+         this.moveController = new EntityRabbit.ControllerMoveRabbit(this);
+        this.initializePathFinderGoals(); // CraftBukkit - moved code
+    }
+
+    // CraftBukkit start - code from constructor
+    public void initializePathFinderGoals(){
+         this.i(0.0D);
+     }
+    // CraftBukkit end
+ 
+     @Override
+     public void initPathfinder() {
+@@ -285,7 +291,7 @@
+         if (i == 99) {
+             this.getAttributeInstance(GenericAttributes.ARMOR).setValue(8.0D);
+             this.goalSelector.a(4, new EntityRabbit.PathfinderGoalKillerRabbitMeleeAttack(this));
+-            this.targetSelector.a(1, (new PathfinderGoalHurtByTarget(this, new Class[0])).a());
+            this.targetSelector.a(1, (new PathfinderGoalHurtByTarget(this, new Class[0])).a(new Class[0])); // CraftBukkit - decompile error
+             this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
+             this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityWolf.class, true));
+             if (!this.hasCustomName()) {
+@@ -401,9 +407,23 @@
+                     Integer integer = (Integer) iblockdata.get(BlockCarrots.AGE);
+ 
+                     if (integer == 0) {
+                        // CraftBukkit start
+                        if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this.entity, blockposition, Blocks.AIR.getBlockData()).isCancelled()) {
+                            return;
+                        }
+                        // CraftBukkit end
+                         world.setTypeAndData(blockposition, Blocks.AIR.getBlockData(), 2);
+                         world.a(blockposition, true, this.entity);
+                     } else {
+                        // CraftBukkit start
+                        if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(
+                                this.entity,
+                                blockposition,
+                                iblockdata.set(BlockCarrots.AGE, integer - 1)
+                        ).isCancelled()) {
+                            return;
+                        }
+                        // CraftBukkit end
+                         world.setTypeAndData(blockposition, (IBlockData) iblockdata.set(BlockCarrots.AGE, integer - 1), 2);
+                         world.triggerEffect(2001, blockposition, Block.getCombinedId(iblockdata));
+                     }
--- a/paper-server/nms-patches/net/minecraft/world/entity/animal/EntitySheep.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntitySheep.patch
@@ -0,0 +1,83 @@
+--- a/net/minecraft/server/EntitySheep.java
+++ b/net/minecraft/server/EntitySheep.java
+@@ -8,10 +8,16 @@
+ import java.util.stream.Collectors;
+ import javax.annotation.Nullable;
+ 
+// CraftBukkit start
+import org.bukkit.craftbukkit.event.CraftEventFactory;
+import org.bukkit.event.entity.SheepRegrowWoolEvent;
+import org.bukkit.inventory.InventoryView;
+// CraftBukkit end
+
+ public class EntitySheep extends EntityAnimal implements IShearable {
+ 
+     private static final DataWatcherObject<Byte> bo = DataWatcher.a(EntitySheep.class, DataWatcherRegistry.a);
+-    private static final Map<EnumColor, IMaterial> bp = (Map) SystemUtils.a((Object) Maps.newEnumMap(EnumColor.class), (enummap) -> {
+    private static final Map<EnumColor, IMaterial> bp = (Map) SystemUtils.a(Maps.newEnumMap(EnumColor.class), (enummap) -> { // CraftBukkit - decompile error
+         enummap.put(EnumColor.WHITE, Blocks.WHITE_WOOL);
+         enummap.put(EnumColor.ORANGE, Blocks.ORANGE_WOOL);
+         enummap.put(EnumColor.MAGENTA, Blocks.MAGENTA_WOOL);
+@@ -138,6 +144,11 @@
+ 
+         if (itemstack.getItem() == Items.SHEARS) {
+             if (!this.world.isClientSide && this.canShear()) {
+                // CraftBukkit start
+                if (!CraftEventFactory.handlePlayerShearEntityEvent(entityhuman, this, itemstack, enumhand)) {
+                    return EnumInteractionResult.PASS;
+                }
+                // CraftBukkit end
+                 this.shear(SoundCategory.PLAYERS);
+                 itemstack.damage(1, entityhuman, (entityhuman1) -> {
+                     entityhuman1.broadcastItemBreak(enumhand);
+@@ -158,7 +169,9 @@
+         int i = 1 + this.random.nextInt(3);
+ 
+         for (int j = 0; j < i; ++j) {
+            this.forceDrops = true; // CraftBukkit
+             EntityItem entityitem = this.a((IMaterial) EntitySheep.bp.get(this.getColor()), 1);
+            this.forceDrops = false; // CraftBukkit
+ 
+             if (entityitem != null) {
+                 entityitem.setMot(entityitem.getMot().add((double) ((this.random.nextFloat() - this.random.nextFloat()) * 0.1F), (double) (this.random.nextFloat() * 0.05F), (double) ((this.random.nextFloat() - this.random.nextFloat()) * 0.1F)));
+@@ -248,6 +261,12 @@
+ 
+     @Override
+     public void blockEaten() {
+        // CraftBukkit start
+        SheepRegrowWoolEvent event = new SheepRegrowWoolEvent((org.bukkit.entity.Sheep) this.getBukkitEntity());
+        this.world.getServer().getPluginManager().callEvent(event);
+
+        if (event.isCancelled()) return;
+        // CraftBukkit end
+         this.setSheared(false);
+         if (this.isBaby()) {
+             this.setAge(60);
+@@ -266,7 +285,7 @@
+         EnumColor enumcolor = ((EntitySheep) entityanimal).getColor();
+         EnumColor enumcolor1 = ((EntitySheep) entityanimal1).getColor();
+         InventoryCrafting inventorycrafting = a(enumcolor, enumcolor1);
+-        Optional optional = this.world.getCraftingManager().craft(Recipes.CRAFTING, inventorycrafting, this.world).map((recipecrafting) -> {
+        Optional<Item> optional = this.world.getCraftingManager().craft(Recipes.CRAFTING, inventorycrafting, this.world).map((recipecrafting) -> { // Eclipse fail
+             return recipecrafting.a(inventorycrafting);
+         }).map(ItemStack::getItem);
+ 
+@@ -284,10 +303,18 @@
+             public boolean canUse(EntityHuman entityhuman) {
+                 return false;
+             }
+
+            // CraftBukkit start
+            @Override
+            public InventoryView getBukkitView() {
+                return null; // TODO: O.O
+            }
+            // CraftBukkit end
+         }, 2, 1);
+ 
+         inventorycrafting.setItem(0, new ItemStack(ItemDye.a(enumcolor)));
+         inventorycrafting.setItem(1, new ItemStack(ItemDye.a(enumcolor1)));
+        inventorycrafting.resultInventory = new InventoryCraftResult(); // CraftBukkit - add result slot for event
+         return inventorycrafting;
+     }
+ 
--- a/paper-server/nms-patches/net/minecraft/world/entity/animal/EntitySnowman.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntitySnowman.patch
@@ -0,0 +1,43 @@
+--- a/net/minecraft/server/EntitySnowman.java
+++ b/net/minecraft/server/EntitySnowman.java
+@@ -2,6 +2,10 @@
+ 
+ import javax.annotation.Nullable;
+ 
+// CraftBukkit start
+import org.bukkit.craftbukkit.event.CraftEventFactory;
+// CraftBukkit end
+
+ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEntity {
+ 
+     private static final DataWatcherObject<Byte> b = DataWatcher.a(EntitySnowman.class, DataWatcherRegistry.a);
+@@ -60,7 +64,7 @@
+             int k = MathHelper.floor(this.locZ());
+ 
+             if (this.world.getBiome(new BlockPosition(i, 0, k)).getAdjustedTemperature(new BlockPosition(i, j, k)) > 1.0F) {
+-                this.damageEntity(DamageSource.BURN, 1.0F);
+                this.damageEntity(CraftEventFactory.MELTING, 1.0F); // CraftBukkit - DamageSource.BURN -> CraftEventFactory.MELTING
+             }
+ 
+             if (!this.world.getGameRules().getBoolean(GameRules.MOB_GRIEFING)) {
+@@ -76,7 +80,7 @@
+                 BlockPosition blockposition = new BlockPosition(i, j, k);
+ 
+                 if (this.world.getType(blockposition).isAir() && this.world.getBiome(blockposition).getAdjustedTemperature(blockposition) < 0.8F && iblockdata.canPlace(this.world, blockposition)) {
+-                    this.world.setTypeUpdate(blockposition, iblockdata);
+                    org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(this.world, blockposition, iblockdata, this); // CraftBukkit
+                 }
+             }
+         }
+@@ -107,6 +111,11 @@
+         ItemStack itemstack = entityhuman.b(enumhand);
+ 
+         if (itemstack.getItem() == Items.SHEARS && this.canShear()) {
+            // CraftBukkit start
+            if (!CraftEventFactory.handlePlayerShearEntityEvent(entityhuman, this, itemstack, enumhand)) {
+                return EnumInteractionResult.PASS;
+            }
+            // CraftBukkit end
+             this.shear(SoundCategory.PLAYERS);
+             if (!this.world.isClientSide) {
+                 itemstack.damage(1, entityhuman, (entityhuman1) -> {
--- a/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityTurtle.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityTurtle.patch
@@ -0,0 +1,44 @@
+--- a/net/minecraft/server/EntityTurtle.java
+++ b/net/minecraft/server/EntityTurtle.java
+@@ -252,7 +252,9 @@
+     protected void m() {
+         super.m();
+         if (!this.isBaby() && this.world.getGameRules().getBoolean(GameRules.DO_MOB_LOOT)) {
+            this.forceDrops = true; // CraftBukkit
+             this.a((IMaterial) Items.SCUTE, 1);
+            this.forceDrops = false; // CraftBukkit
+         }
+ 
+     }
+@@ -279,7 +281,9 @@
+ 
+     @Override
+     public void onLightningStrike(WorldServer worldserver, EntityLightning entitylightning) {
+        org.bukkit.craftbukkit.event.CraftEventFactory.entityDamage = entitylightning; // CraftBukkit
+         this.damageEntity(DamageSource.LIGHTNING, Float.MAX_VALUE);
+        org.bukkit.craftbukkit.event.CraftEventFactory.entityDamage = null; // CraftBukkit
+     }
+ 
+     static class g extends NavigationGuardian {
+@@ -438,8 +442,12 @@
+                 } else if (this.g.bv > 200) {
+                     World world = this.g.world;
+ 
+                    // CraftBukkit start
+                    if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this.g, this.e.up(), (IBlockData) Blocks.TURTLE_EGG.getBlockData().set(BlockTurtleEgg.b, this.g.random.nextInt(4) + 1)).isCancelled()) {
+                     world.playSound((EntityHuman) null, blockposition, SoundEffects.ENTITY_TURTLE_LAY_EGG, SoundCategory.BLOCKS, 0.3F, 0.9F + world.random.nextFloat() * 0.2F);
+                     world.setTypeAndData(this.e.up(), (IBlockData) Blocks.TURTLE_EGG.getBlockData().set(BlockTurtleEgg.b, this.g.random.nextInt(4) + 1), 3);
+                    }
+                    // CraftBukkit end
+                     this.g.setHasEgg(false);
+                     this.g.u(false);
+                     this.g.setLoveTicks(600);
+@@ -519,7 +527,7 @@
+                 --this.e;
+                 return false;
+             } else {
+-                this.d = this.b.world.a(EntityTurtle.i.a, (EntityLiving) this.b);
+                this.d = this.b.world.a(this.a, (EntityLiving) this.b); // CraftBukkit - decompile error
+                 return this.d == null ? false : this.a(this.d.getItemInMainHand()) || this.a(this.d.getItemInOffHand());
+             }
+         }
--- a/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityWolf.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityWolf.patch
@@ -0,0 +1,94 @@
+--- a/net/minecraft/server/EntityWolf.java
+++ b/net/minecraft/server/EntityWolf.java
+@@ -4,6 +4,11 @@
+ import java.util.function.Predicate;
+ import javax.annotation.Nullable;
+ 
+// CraftBukkit start
+import org.bukkit.craftbukkit.event.CraftEventFactory;
+import org.bukkit.event.entity.EntityTargetEvent.TargetReason;
+// CraftBukkit end
+
+ public class EntityWolf extends EntityTameableAnimal implements IEntityAngerable {
+ 
+     private static final DataWatcherObject<Boolean> br = DataWatcher.a(EntityWolf.class, DataWatcherRegistry.i);
+@@ -43,7 +48,7 @@
+         this.goalSelector.a(10, new PathfinderGoalRandomLookaround(this));
+         this.targetSelector.a(1, new PathfinderGoalOwnerHurtByTarget(this));
+         this.targetSelector.a(2, new PathfinderGoalOwnerHurtTarget(this));
+-        this.targetSelector.a(3, (new PathfinderGoalHurtByTarget(this, new Class[0])).a());
+        this.targetSelector.a(3, (new PathfinderGoalHurtByTarget(this, new Class[0])).a(new Class[0])); // CraftBukkit - decompile error
+         this.targetSelector.a(4, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, 10, true, false, this::a_));
+         this.targetSelector.a(5, new PathfinderGoalRandomTargetNonTamed<>(this, EntityAnimal.class, false, EntityWolf.bq));
+         this.targetSelector.a(6, new PathfinderGoalRandomTargetNonTamed<>(this, EntityTurtle.class, false, EntityTurtle.bo));
+@@ -55,6 +60,24 @@
+         return EntityInsentient.p().a(GenericAttributes.MOVEMENT_SPEED, 0.30000001192092896D).a(GenericAttributes.MAX_HEALTH, 8.0D).a(GenericAttributes.ATTACK_DAMAGE, 2.0D);
+     }
+ 
+    // CraftBukkit - add overriden version
+    @Override
+    public boolean setGoalTarget(EntityLiving entityliving, org.bukkit.event.entity.EntityTargetEvent.TargetReason reason, boolean fire) {
+        if (!super.setGoalTarget(entityliving, reason, fire)) {
+            return false;
+        }
+        entityliving = getGoalTarget();
+        /* // PAIL
+        if (entityliving == null) {
+            this.setAngry(false);
+        } else if (!this.isTamed()) {
+            this.setAngry(true);
+        }
+        */
+        return true;
+    }
+    // CraftBukkit end
+
+     @Override
+     protected void initDatawatcher() {
+         super.initDatawatcher();
+@@ -201,7 +224,7 @@
+         } else {
+             Entity entity = damagesource.getEntity();
+ 
+-            this.setWillSit(false);
+            // this.setWillSit(false); // CraftBukkit - moved into EntityLiving.damageEntity(DamageSource, float)
+             if (entity != null && !(entity instanceof EntityHuman) && !(entity instanceof EntityArrow)) {
+                 f = (f + 1.0F) / 2.0F;
+             }
+@@ -226,7 +249,7 @@
+         super.setTamed(flag);
+         if (flag) {
+             this.getAttributeInstance(GenericAttributes.MAX_HEALTH).setValue(20.0D);
+-            this.setHealth(20.0F);
+            this.setHealth(this.getMaxHealth()); // CraftBukkit - 20.0 -> getMaxHealth()
+         } else {
+             this.getAttributeInstance(GenericAttributes.MAX_HEALTH).setValue(8.0D);
+         }
+@@ -250,7 +273,7 @@
+                         itemstack.subtract(1);
+                     }
+ 
+-                    this.heal((float) item.getFoodInfo().getNutrition());
+                    this.heal((float) item.getFoodInfo().getNutrition(), org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.EATING); // CraftBukkit
+                     return EnumInteractionResult.SUCCESS;
+                 }
+ 
+@@ -261,7 +284,7 @@
+                         this.setWillSit(!this.isWillSit());
+                         this.jumping = false;
+                         this.navigation.o();
+-                        this.setGoalTarget((EntityLiving) null);
+                        this.setGoalTarget((EntityLiving) null, TargetReason.FORGOT_TARGET, true); // CraftBukkit - reason
+                         return EnumInteractionResult.SUCCESS;
+                     }
+ 
+@@ -283,7 +306,8 @@
+                     itemstack.subtract(1);
+                 }
+ 
+-                if (this.random.nextInt(3) == 0) {
+                // CraftBukkit - added event call and isCancelled check.
+                if (this.random.nextInt(3) == 0 && !CraftEventFactory.callEntityTameEvent(this, entityhuman).isCancelled()) {
+                     this.tame(entityhuman);
+                     this.navigation.o();
+                     this.setGoalTarget((EntityLiving) null);
--- a/paper-server/nms-patches/net/minecraft/world/entity/animal/horse/EntityHorseAbstract.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/animal/horse/EntityHorseAbstract.patch
@@ -0,0 +1,94 @@
+--- a/net/minecraft/server/EntityHorseAbstract.java
+++ b/net/minecraft/server/EntityHorseAbstract.java
+@@ -7,6 +7,8 @@
+ import java.util.function.Predicate;
+ import javax.annotation.Nullable;
+ 
+import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason; // CraftBukkit
+
+ public abstract class EntityHorseAbstract extends EntityAnimal implements IInventoryListener, IJumpable, ISaddleable {
+ 
+     private static final Predicate<EntityLiving> bw = (entityliving) -> {
+@@ -34,6 +36,7 @@
+     private float bK;
+     protected boolean bu = true;
+     protected int bv;
+    public int maxDomestication = 100; // CraftBukkit - store max domestication value
+ 
+     protected EntityHorseAbstract(EntityTypes<? extends EntityHorseAbstract> entitytypes, World world) {
+         super(entitytypes, world);
+@@ -218,7 +221,7 @@
+     public void loadChest() {
+         InventorySubcontainer inventorysubcontainer = this.inventoryChest;
+ 
+-        this.inventoryChest = new InventorySubcontainer(this.getChestSlots());
+        this.inventoryChest = new InventorySubcontainer(this.getChestSlots(), (org.bukkit.entity.AbstractHorse) this.getBukkitEntity()); // CraftBukkit
+         if (inventorysubcontainer != null) {
+             inventorysubcontainer.b((IInventoryListener) this);
+             int i = Math.min(inventorysubcontainer.getSize(), this.inventoryChest.getSize());
+@@ -334,7 +337,7 @@
+     }
+ 
+     public int getMaxDomestication() {
+-        return 100;
+        return this.maxDomestication; // CraftBukkit - return stored max domestication instead of 100
+     }
+ 
+     @Override
+@@ -405,7 +408,7 @@
+         }
+ 
+         if (this.getHealth() < this.getMaxHealth() && f > 0.0F) {
+-            this.heal(f);
+            this.heal(f, RegainReason.EATING); // CraftBukkit
+             flag = true;
+         }
+ 
+@@ -481,7 +484,7 @@
+         super.movementTick();
+         if (!this.world.isClientSide && this.isAlive()) {
+             if (this.random.nextInt(900) == 0 && this.deathTicks == 0) {
+-                this.heal(1.0F);
+                this.heal(1.0F, RegainReason.REGEN); // CraftBukkit
+             }
+ 
+             if (this.fl()) {
+@@ -718,6 +721,7 @@
+         if (this.getOwnerUUID() != null) {
+             nbttagcompound.a("Owner", this.getOwnerUUID());
+         }
+        nbttagcompound.setInt("Bukkit.MaxDomestication", this.maxDomestication); // CraftBukkit
+ 
+         if (!this.inventoryChest.getItem(0).isEmpty()) {
+             nbttagcompound.set("SaddleItem", this.inventoryChest.getItem(0).save(new NBTTagCompound()));
+@@ -745,6 +749,11 @@
+         if (uuid != null) {
+             this.setOwnerUUID(uuid);
+         }
+        // CraftBukkit start
+        if (nbttagcompound.hasKey("Bukkit.MaxDomestication")) {
+            this.maxDomestication = nbttagcompound.getInt("Bukkit.MaxDomestication");
+        }
+        // CraftBukkit end
+ 
+         if (nbttagcompound.hasKeyOfType("SaddleItem", 10)) {
+             ItemStack itemstack = ItemStack.a(nbttagcompound.getCompound("SaddleItem"));
+@@ -796,6 +805,18 @@
+ 
+     @Override
+     public void b(int i) {
+        // CraftBukkit start
+        float power;
+        if (i >= 90) {
+            power = 1.0F;
+        } else {
+            power = 0.4F + 0.4F * (float) i / 90.0F;
+        }
+        org.bukkit.event.entity.HorseJumpEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callHorseJumpEvent(this, power);
+        if (event.isCancelled()) {
+            return;
+        }
+        // CraftBukkit end
+         this.canSlide = true;
+         this.eU();
+         this.fn();
--- a/paper-server/nms-patches/net/minecraft/world/entity/animal/horse/EntityLlamaTrader.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/animal/horse/EntityLlamaTrader.patch
@@ -0,0 +1,11 @@
+--- a/net/minecraft/server/EntityLlamaTrader.java
+++ b/net/minecraft/server/EntityLlamaTrader.java
+@@ -127,7 +127,7 @@
+ 
+         @Override
+         public void c() {
+-            this.e.setGoalTarget(this.c);
+            this.e.setGoalTarget(this.c, org.bukkit.event.entity.EntityTargetEvent.TargetReason.TARGET_ATTACKED_OWNER, true); // CraftBukkit
+             Entity entity = this.b.getLeashHolder();
+ 
+             if (entity instanceof EntityVillagerTrader) {
--- a/paper-server/nms-patches/net/minecraft/world/entity/animal/horse/PathfinderGoalHorseTrap.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/animal/horse/PathfinderGoalHorseTrap.patch
@@ -0,0 +1,28 @@
+--- a/net/minecraft/server/PathfinderGoalHorseTrap.java
+++ b/net/minecraft/server/PathfinderGoalHorseTrap.java
+@@ -25,19 +25,20 @@
+ 
+         entitylightning.teleportAndSync(this.a.locX(), this.a.locY(), this.a.locZ());
+         entitylightning.setEffect(true);
+-        worldserver.addEntity(entitylightning);
+        worldserver.strikeLightning(entitylightning, org.bukkit.event.weather.LightningStrikeEvent.Cause.TRAP); // CraftBukkit
+         EntitySkeleton entityskeleton = this.a(difficultydamagescaler, this.a);
+ 
+-        entityskeleton.startRiding(this.a);
+-        worldserver.addAllEntities(entityskeleton);
+        if (entityskeleton != null) entityskeleton.startRiding(this.a); // CraftBukkit
+        worldserver.addAllEntities(entityskeleton, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.TRAP); // CraftBukkit
+ 
+         for (int i = 0; i < 3; ++i) {
+             EntityHorseAbstract entityhorseabstract = this.a(difficultydamagescaler);
+            if (entityhorseabstract == null) continue; // CraftBukkit
+             EntitySkeleton entityskeleton1 = this.a(difficultydamagescaler, entityhorseabstract);
+ 
+-            entityskeleton1.startRiding(entityhorseabstract);
+            if (entityskeleton1 != null) entityskeleton1.startRiding(entityhorseabstract); // CraftBukkit
+             entityhorseabstract.i(this.a.getRandom().nextGaussian() * 0.5D, 0.0D, this.a.getRandom().nextGaussian() * 0.5D);
+-            worldserver.addAllEntities(entityhorseabstract);
+            worldserver.addAllEntities(entityhorseabstract, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.JOCKEY); // CraftBukkit
+         }
+ 
+     }