Skip to content

Commit b1d412f

Browse files
committed
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)
1 parent aa289e2 commit b1d412f

3 files changed

Lines changed: 5 additions & 4 deletions

File tree

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
22
version = 1.21.5-R0.1-SNAPSHOT
33

44
mcVersion = 1.21.5
5-
paperCommit = 519e4224b1ba73a99c58c8fc53aab003eb6af37a
5+
paperCommit = ba7fb23ddd2376079951d1e22f9204d1ed691585
66

77
org.gradle.configuration-cache = true
88
org.gradle.caching = true

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
22
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
3-
@@ -390,4 +_,11 @@
3+
@@ -258,4 +_,11 @@
44
public void restock() {
55
getHandle().restock();
66
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java
22
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java
3-
@@ -228,4 +_,15 @@
4-
return this.getKey().hashCode();
3+
@@ -135,4 +_,16 @@
4+
super(holder);
55
}
66
}
7+
+
78
+ // Purpur start - Configurable chance for wolves to spawn rabid
89
+ @Override
910
+ public boolean isRabid() {

0 commit comments

Comments
 (0)