From bbb04570ea3256eaf9e6444616081ab6e43aa627 Mon Sep 17 00:00:00 2001
From: granny <granny@purpurmc.org>
Date: Sun, 5 May 2024 01:26:48 -0700
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@7401313 fix shear drops for wolf and bogged
---
 gradle.properties                                             | 2 +-
 .../0109-Configurable-chance-for-wolves-to-spawn-rabid.patch  | 4 ++--
 patches/server/0124-Config-to-always-tame-in-Creative.patch   | 4 ++--
 patches/server/0223-Shears-can-have-looting-enchantment.patch | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index aa9957417..79b7d1c77 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.20.6-R0.1-SNAPSHOT
 
 mcVersion = 1.20.6
-paperCommit = 6fcca46674f7ebbc261bd63339fbdcba21ab5133
+paperCommit = 7401313e16a03156f1ab09fc5eeee44ae431692a
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/server/0109-Configurable-chance-for-wolves-to-spawn-rabid.patch b/patches/server/0109-Configurable-chance-for-wolves-to-spawn-rabid.patch
index b20a45261..fe20c8c8d 100644
--- a/patches/server/0109-Configurable-chance-for-wolves-to-spawn-rabid.patch
+++ b/patches/server/0109-Configurable-chance-for-wolves-to-spawn-rabid.patch
@@ -7,7 +7,7 @@ Configurable chance to spawn a wolf that is rabid.
 Rabid wolves attack all players, mobs, and animals.
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-index 4212c3921a4059c539ca37f9609ef50538bc1fae..5c74febb5ff6632a35f856717a6c44df38c1d329 100644
+index 2267f8da1c27ff54b2ced59ef15eb45357b7075d..74ed226b5037f3258106f07384e14baf087be1c3 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 @@ -30,6 +30,8 @@ import net.minecraft.world.DifficultyInstance;
@@ -149,7 +149,7 @@ index 4212c3921a4059c539ca37f9609ef50538bc1fae..5c74febb5ff6632a35f856717a6c44df
              this.interestedAngleO = this.interestedAngle;
              if (this.isInterested()) {
                  this.interestedAngle += (1.0F - this.interestedAngle) * 0.4F;
-@@ -539,6 +613,19 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
+@@ -541,6 +615,19 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
              itemstack.consume(1, player);
              this.tryToTame(player);
              return InteractionResult.SUCCESS;
diff --git a/patches/server/0124-Config-to-always-tame-in-Creative.patch b/patches/server/0124-Config-to-always-tame-in-Creative.patch
index 4088c7e41..42de81d83 100644
--- a/patches/server/0124-Config-to-always-tame-in-Creative.patch
+++ b/patches/server/0124-Config-to-always-tame-in-Creative.patch
@@ -46,10 +46,10 @@ index 7b139028ae5c590960e6b8a74b6ba667f3db7f5d..490d7f8ac402f50a2f2f90ca03216978
                      this.level().broadcastEntityEvent(this, (byte) 7);
                  } else {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-index cfcfa1dfb6d0512124ac226c2dc8274c837c21dd..4a866ba9ac3ce9403d490f48df88ab334ae3e5ae 100644
+index db0d71da579752bfb8246f5fa2ec9d360f53c7a8..31b5d874fdc6f7d2eaabe877b32b64d360cb48e3 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-@@ -644,7 +644,7 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
+@@ -646,7 +646,7 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
  
      private void tryToTame(Player player) {
          // CraftBukkit - added event call and isCancelled check.
diff --git a/patches/server/0223-Shears-can-have-looting-enchantment.patch b/patches/server/0223-Shears-can-have-looting-enchantment.patch
index 0f524214d..059266542 100644
--- a/patches/server/0223-Shears-can-have-looting-enchantment.patch
+++ b/patches/server/0223-Shears-can-have-looting-enchantment.patch
@@ -126,10 +126,10 @@ index 69cdccca01fe7d10e6d958e16d91efe08f699505..3b74931ae4e3a869d8db38c119e57b44
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Bogged.java b/src/main/java/net/minecraft/world/entity/monster/Bogged.java
-index 754eb747179d9318bc5a3883e5622cc400c4e06c..4e929539cb093d58f3311d5f6a62bd1aeb71cfb0 100644
+index e9f9b041ae7195e9d23bd446454b1d8c47a1ace1..03b1023e182744a84d324bdad082cc1b9e574e30 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Bogged.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Bogged.java
-@@ -155,7 +155,7 @@ public class Bogged extends AbstractSkeleton implements Shearable {
+@@ -159,7 +159,7 @@ public class Bogged extends AbstractSkeleton implements Shearable {
  
      // Paper start - shear drops API
      @Override