Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@ba7fb23d Finish moving over to Holderable (#12646)

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java.patch

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
-@@ -390,4 +_,11 @@
+@@ -258,4 +_,11 @@
      public void restock() {
          getHandle().restock();
      }

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java.patch

@@ -1,9 +1,10 @@
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java
-@@ -228,4 +_,15 @@
-             return this.getKey().hashCode();
+@@ -135,4 +_,16 @@
+             super(holder);
          }
      }
++
 +    // Purpur start - Configurable chance for wolves to spawn rabid
 +    @Override
 +    public boolean isRabid() {