six more patches

patches/server/0036-Cat-spawning-options.patch

@@ -0,0 +1,70 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <blake.galbreath@gmail.com>
+Date: Thu, 26 Dec 2019 18:52:55 -0600
+Subject: [PATCH] Cat spawning options
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java b/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java
+index 4cab98b5e441a174482893d3d289bbafa1f7a5fc..fa3cdff99a16b67ed86c8f7940ffa139930c3448 100644
+--- a/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java
++++ b/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java
+@@ -30,7 +30,7 @@ public class CatSpawner implements CustomSpawner {
+             if (this.nextTick > 0) {
+                 return 0;
+             } else {
+-                this.nextTick = 1200;
++                this.nextTick = world.purpurConfig.catSpawnDelay; // Purpur
+                 Player player = world.getRandomPlayer();
+                 if (player == null) {
+                     return 0;
+@@ -63,9 +63,13 @@ public class CatSpawner implements CustomSpawner {
+     }
+ 
+     private int spawnInVillage(ServerLevel world, BlockPos pos) {
+-        int i = 48;
+-        if (world.getPoiManager().getCountInRange(PoiType.HOME.getPredicate(), pos, 48, PoiManager.Occupancy.IS_OCCUPIED) > 4L) {
+-            List<Cat> list = world.getEntitiesOfClass(Cat.class, (new AABB(pos)).inflate(48.0D, 8.0D, 48.0D));
++        // Purpur start
++        int range = world.purpurConfig.catSpawnVillageScanRange;
++        if (range <= 0) return 0;
++
++        if (world.getPoiManager().getCountInRange(PoiType.HOME.getPredicate(), pos, range, PoiManager.Occupancy.IS_OCCUPIED) > 4L) {
++            List<Cat> list = world.getEntitiesOfClass(Cat.class, (new AABB(pos)).inflate(range, 8.0D, range));
++            // Purpur end
+             if (list.size() < 5) {
+                 return this.spawnCat(pos, world);
+             }
+@@ -75,8 +79,11 @@ public class CatSpawner implements CustomSpawner {
+     }
+ 
+     private int spawnInHut(ServerLevel world, BlockPos pos) {
+-        int i = 16;
+-        List<Cat> list = world.getEntitiesOfClass(Cat.class, (new AABB(pos)).inflate(16.0D, 8.0D, 16.0D));
++        // Purpur start
++        int range = world.purpurConfig.catSpawnSwampHutScanRange;
++        if (range <= 0) return 0;
++        List<Cat> list = world.getEntitiesOfClass(Cat.class, (new AABB(pos)).inflate(range, 8.0D, range));
++        // Purpur end
+         return list.size() < 1 ? this.spawnCat(pos, world) : 0;
+     }
+ 
+diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+index 5d80cd3049e33d1bed7d347f4092a0ca476f711b..808803acb28dd6d7b2db1153a5a30cc3be46b2e4 100644
+--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
++++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+@@ -118,6 +118,15 @@ public class PurpurWorldConfig {
+         turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
+     }
+ 
++    public int catSpawnDelay = 1200;
++    public int catSpawnSwampHutScanRange = 16;
++    public int catSpawnVillageScanRange = 48;
++    private void catSettings() {
++        catSpawnDelay = getInt("mobs.cat.spawn-delay", catSpawnDelay);
++        catSpawnSwampHutScanRange = getInt("mobs.cat.scan-range-for-other-cats.swamp-hut", catSpawnSwampHutScanRange);
++        catSpawnVillageScanRange = getInt("mobs.cat.scan-range-for-other-cats.village", catSpawnVillageScanRange);
++    }
++
+     public boolean chickenRetaliate = false;
+     private void chickenSettings() {
+         chickenRetaliate = getBoolean("mobs.chicken.retaliate", chickenRetaliate);

patches/server/0037-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch

@@ -0,0 +1,21 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <blake.galbreath@gmail.com>
+Date: Thu, 2 Jan 2020 01:23:22 -0600
+Subject: [PATCH] MC-147659 - Fix non black cats spawning in swamp huts
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java b/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java
+index fa3cdff99a16b67ed86c8f7940ffa139930c3448..89defd6b6d64e9048b0b2e7c872f1a199876457f 100644
+--- a/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java
++++ b/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java
+@@ -92,8 +92,9 @@ public class CatSpawner implements CustomSpawner {
+         if (cat == null) {
+             return 0;
+         } else {
++            cat.moveTo(pos, 0.0F, 0.0F); // Purpur
+             cat.finalizeSpawn(world, world.getCurrentDifficultyAt(pos), MobSpawnType.NATURAL, (SpawnGroupData)null, (CompoundTag)null);
+-            cat.moveTo(pos, 0.0F, 0.0F);
++            // cat.moveTo(pos, 0.0F, 0.0F); // Purpur - move up - fixes non black cat types spawning inside swamp huts
+             world.addFreshEntityWithPassengers(cat);
+             return 1;
+         }

patches/server/0038-Cows-eat-mushrooms.patch

@@ -0,0 +1,131 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <blake.galbreath@gmail.com>
+Date: Sat, 4 May 2019 01:10:30 -0500
+Subject: [PATCH] Cows eat mushrooms
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/animal/Cow.java b/src/main/java/net/minecraft/world/entity/animal/Cow.java
+index c9dcbc2dcb2736d0f448496c67121db29b7d4deb..c338dcca4242e472fe2290f0ec20ea67a90cdd06 100644
+--- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
++++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
+@@ -1,6 +1,7 @@
+ package net.minecraft.world.entity.animal;
+ 
+ import net.minecraft.core.BlockPos;
++import net.minecraft.core.particles.ParticleTypes;
+ import net.minecraft.server.level.ServerLevel;
+ import net.minecraft.sounds.SoundEvent;
+ import net.minecraft.sounds.SoundEvents;
+@@ -28,6 +29,7 @@ import net.minecraft.world.item.ItemUtils;
+ import net.minecraft.world.item.Items;
+ import net.minecraft.world.item.crafting.Ingredient;
+ import net.minecraft.world.level.Level;
++import net.minecraft.world.level.block.Blocks;
+ import net.minecraft.world.level.block.state.BlockState;
+ // CraftBukkit start
+ import org.bukkit.craftbukkit.event.CraftEventFactory;
+@@ -45,6 +47,7 @@ public class Cow extends Animal {
+         this.goalSelector.addGoal(0, new FloatGoal(this));
+         this.goalSelector.addGoal(1, new PanicGoal(this, 2.0D));
+         this.goalSelector.addGoal(2, new BreedGoal(this, 1.0D));
++        if (level.purpurConfig.cowFeedMushrooms > 0) this.goalSelector.addGoal(3, new TemptGoal(this, 1.25D, Ingredient.of(Items.WHEAT, Blocks.RED_MUSHROOM.asItem(), Blocks.BROWN_MUSHROOM.asItem()), false)); else // Purpur
+         this.goalSelector.addGoal(3, new TemptGoal(this, 1.25D, Ingredient.of(Items.WHEAT), false));
+         this.goalSelector.addGoal(4, new FollowParentGoal(this, 1.25D));
+         this.goalSelector.addGoal(5, new WaterAvoidingRandomStrollGoal(this, 1.0D));
+@@ -99,11 +102,80 @@ public class Cow extends Animal {
+ 
+             player.setItemInHand(hand, itemstack1);
+             return InteractionResult.sidedSuccess(this.level.isClientSide);
++        // Purpur start - feed mushroom to change to mooshroom
++        } else if (level.purpurConfig.cowFeedMushrooms > 0 && this.getType() != EntityType.MOOSHROOM && isMushroom(itemstack)) {
++            return this.feedMushroom(player, itemstack);
++        // Purpur end
+         } else {
+             return super.mobInteract(player, hand);
+         }
+     }
+ 
++    // Purpur start - feed mushroom to change to mooshroom
++    private int redMushroomsFed = 0;
++    private int brownMushroomsFed = 0;
++
++    private boolean isMushroom(ItemStack stack) {
++        return stack.getItem() == Blocks.RED_MUSHROOM.asItem() || stack.getItem() == Blocks.BROWN_MUSHROOM.asItem();
++    }
++
++    private int incrementFeedCount(ItemStack stack) {
++        if (stack.getItem() == Blocks.RED_MUSHROOM.asItem()) {
++            return ++redMushroomsFed;
++        } else {
++            return ++brownMushroomsFed;
++        }
++    }
++
++    private InteractionResult feedMushroom(Player player, ItemStack stack) {
++        level.broadcastEntityEvent(this, (byte) 18); // hearts
++        playSound(SoundEvents.COW_MILK, 1.0F, 1.0F);
++        if (incrementFeedCount(stack) < level.purpurConfig.cowFeedMushrooms) {
++            if (!player.getAbilities().instabuild) {
++                stack.shrink(1);
++            }
++            return InteractionResult.CONSUME; // require 5 mushrooms to transform (prevents mushroom duping)
++        }
++        MushroomCow mooshroom = EntityType.MOOSHROOM.create(level);
++        if (mooshroom == null) {
++            return InteractionResult.PASS;
++        }
++        if (stack.getItem() == Blocks.BROWN_MUSHROOM.asItem()) {
++            mooshroom.setMushroomType(MushroomCow.MushroomType.BROWN);
++        } else {
++            mooshroom.setMushroomType(MushroomCow.MushroomType.RED);
++        }
++        mooshroom.moveTo(this.getX(), this.getY(), this.getZ(), this.getYRot(), this.getXRot());
++        mooshroom.setHealth(this.getHealth());
++        mooshroom.setAge(getAge());
++        mooshroom.copyPosition(this);
++        mooshroom.setYBodyRot(this.yBodyRot);
++        mooshroom.setYHeadRot(this.getYHeadRot());
++        mooshroom.yRotO = this.yRotO;
++        mooshroom.xRotO = this.xRotO;
++        if (this.hasCustomName()) {
++            mooshroom.setCustomName(this.getCustomName());
++        }
++        if (CraftEventFactory.callEntityTransformEvent(this, mooshroom, org.bukkit.event.entity.EntityTransformEvent.TransformReason.INFECTION).isCancelled()) {
++            return InteractionResult.PASS;
++        }
++        if (!new com.destroystokyo.paper.event.entity.EntityTransformedEvent(this.getBukkitEntity(), mooshroom.getBukkitEntity(), com.destroystokyo.paper.event.entity.EntityTransformedEvent.TransformedReason.INFECTED).callEvent()) {
++            return InteractionResult.PASS;
++        }
++        this.level.addFreshEntity(mooshroom);
++        this.remove(RemovalReason.DISCARDED);
++        if (!player.getAbilities().instabuild) {
++            stack.shrink(1);
++        }
++        for (int i = 0; i < 15; ++i) {
++            ((ServerLevel) level).sendParticles(((ServerLevel) level).players, null, ParticleTypes.HAPPY_VILLAGER,
++                getX() + random.nextFloat(), getY() + (random.nextFloat() * 2), getZ() + random.nextFloat(), 1,
++                random.nextGaussian() * 0.05D, random.nextGaussian() * 0.05D, random.nextGaussian() * 0.05D, 0, true);
++        }
++        return InteractionResult.SUCCESS;
++    }
++    // Purpur end
++
+     @Override
+     public Cow getBreedOffspring(ServerLevel world, AgeableMob entity) {
+         return (Cow) EntityType.COW.create((Level) world);
+diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+index 808803acb28dd6d7b2db1153a5a30cc3be46b2e4..37b4b1b749a961e1702408c86dd84bc0dcbfa12b 100644
+--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
++++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+@@ -132,6 +132,11 @@ public class PurpurWorldConfig {
+         chickenRetaliate = getBoolean("mobs.chicken.retaliate", chickenRetaliate);
+     }
+ 
++    public int cowFeedMushrooms = 0;
++    private void cowSettings() {
++        cowFeedMushrooms = getInt("mobs.cow.feed-mushrooms-for-mooshroom", cowFeedMushrooms);
++    }
++
+     public double creeperChargedChance = 0.0D;
+     private void creeperSettings() {
+         creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);

patches/server/0039-Fix-cow-rotation-when-shearing-mooshroom.patch

@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <blake.galbreath@gmail.com>
+Date: Fri, 3 May 2019 23:53:16 -0500
+Subject: [PATCH] Fix cow rotation when shearing mooshroom
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
+index d9fb3df35de94ae5abbb86ace0328bbe6f5403b3..96f7ab847d05f461d4771a3fefbd32cab6366afa 100644
+--- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
++++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
+@@ -175,7 +175,13 @@ public class MushroomCow extends Cow implements Shearable {
+ 
+             entitycow.moveTo(this.getX(), this.getY(), this.getZ(), this.getYRot(), this.getXRot());
+             entitycow.setHealth(this.getHealth());
++            // Purpur start
++            entitycow.copyPosition(this);
+             entitycow.yBodyRot = this.yBodyRot;
++            entitycow.setYHeadRot(this.getYHeadRot());
++            entitycow.yRotO = this.yRotO;
++            entitycow.xRotO = this.xRotO;
++            // Purpur end
+             if (this.hasCustomName()) {
+                 entitycow.setCustomName(this.getCustomName());
+                 entitycow.setCustomNameVisible(this.isCustomNameVisible());

patches/server/0040-Pigs-give-saddle-back.patch

@@ -0,0 +1,45 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <blake.galbreath@gmail.com>
+Date: Sun, 12 May 2019 01:14:46 -0500
+Subject: [PATCH] Pigs give saddle back
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/animal/Pig.java b/src/main/java/net/minecraft/world/entity/animal/Pig.java
+index 2c95b6eddfe46e5d2ad495bfc86ccc24ae75e704..8a99b04e8179a640a289c4853777aa88c725216a 100644
+--- a/src/main/java/net/minecraft/world/entity/animal/Pig.java
++++ b/src/main/java/net/minecraft/world/entity/animal/Pig.java
+@@ -155,6 +155,18 @@ public class Pig extends Animal implements ItemSteerable, Saddleable {
+ 
+         if (!flag && this.isSaddled() && !this.isVehicle() && !player.isSecondaryUseActive()) {
+             if (!this.level.isClientSide) {
++                // Purpur start
++                if (level.purpurConfig.pigGiveSaddleBack && player.isCrouching()) {
++                    this.steering.setSaddle(false);
++                    if (!player.getAbilities().instabuild) {
++                        ItemStack saddle = new ItemStack(Items.SADDLE);
++                        if (!player.getInventory().add(saddle)) {
++                            player.drop(saddle, false);
++                        }
++                    }
++                    return InteractionResult.SUCCESS;
++                }
++                // Purpur end
+                 player.startRiding(this);
+             }
+ 
+diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+index 37b4b1b749a961e1702408c86dd84bc0dcbfa12b..7a31a6973f1f7ec301befe00ce0153a0827f593e 100644
+--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
++++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+@@ -188,6 +188,11 @@ public class PurpurWorldConfig {
+         ironGolemCanSwim = getBoolean("mobs.iron_golem.can-swim", ironGolemCanSwim);
+     }
+ 
++    public boolean pigGiveSaddleBack = false;
++    private void pigSettings() {
++        pigGiveSaddleBack = getBoolean("mobs.pig.give-saddle-back", pigGiveSaddleBack);
++    }
++
+     public String polarBearBreedableItemString = "";
+     public Item polarBearBreedableItem = null;
+     private void polarBearSettings() {

patches/server/0041-Snowman-drop-and-put-back-pumpkin.patch

@@ -0,0 +1,51 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <blake.galbreath@gmail.com>
+Date: Fri, 3 May 2019 23:58:44 -0500
+Subject: [PATCH] Snowman drop and put back pumpkin
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
+index 2631f08496c8e45874b22760b559a91b7b2bf415..226cadfc5f109b8f5060b5147034ac273f14133d 100644
+--- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
++++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
+@@ -164,6 +164,14 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
+             }
+ 
+             return InteractionResult.sidedSuccess(this.level.isClientSide);
++            // Purpur start
++        } else if (level.purpurConfig.snowGolemPutPumpkinBack && !hasPumpkin() && itemstack.getItem() == Blocks.CARVED_PUMPKIN.asItem()) {
++            setPumpkin(false);
++            if (!player.getAbilities().instabuild) {
++                itemstack.shrink(1);
++            }
++            return InteractionResult.SUCCESS;
++        // Purpur end
+         } else {
+             return InteractionResult.PASS;
+         }
+@@ -174,6 +182,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
+         this.level.playSound((Player) null, (Entity) this, SoundEvents.SNOW_GOLEM_SHEAR, shearedSoundCategory, 1.0F, 1.0F);
+         if (!this.level.isClientSide()) {
+             this.setPumpkin(false);
++            if (level.purpurConfig.snowGolemDropsPumpkin) // Purpur
+             this.spawnAtLocation(new ItemStack(Items.CARVED_PUMPKIN), 1.7F);
+         }
+ 
+diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+index 7a31a6973f1f7ec301befe00ce0153a0827f593e..d04981114fa2bce174441558b4d1c7c43ae2ea34 100644
+--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
++++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+@@ -208,6 +208,13 @@ public class PurpurWorldConfig {
+         rabbitNaturalKiller = getDouble("mobs.rabbit.spawn-killer-rabbit-chance", rabbitNaturalKiller);
+     }
+ 
++    public boolean snowGolemDropsPumpkin = true;
++    public boolean snowGolemPutPumpkinBack = false;
++    private void snowGolemSettings() {
++        snowGolemDropsPumpkin = getBoolean("mobs.snow_golem.drop-pumpkin-when-sheared", snowGolemDropsPumpkin);
++        snowGolemPutPumpkinBack = getBoolean("mobs.snow_golem.pumpkin-can-be-added-back", snowGolemPutPumpkinBack);
++    }
++
+     public int villagerBrainTicks = 1;
+     public boolean villagerUseBrainTicksOnlyWhenLagging = true;
+     private void villagerSettings() {