Merge branch 'ver/1.21.5' into ver/1.21.6

This commit is contained in:
granny
2025-06-13 22:30:22 -07:00
5 changed files with 30 additions and 7 deletions

View File

@@ -1,10 +1,9 @@
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
@@ -380,4 +_,12 @@
@@ -380,4 +_,11 @@
public void clearReputations() {
getHandle().getGossips().gossips.clear();
}
+ // Paper end
+
+ // Purpur start - Lobotomize stuck villagers
+ @Override

View File

@@ -1,9 +1,9 @@
--- 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();
}
@@ -91,6 +_,18 @@
this.getHandle().setSoundVariant(CraftSoundVariant.bukkitToMinecraftHolder(soundVariant));
}
+ // Purpur start - Configurable chance for wolves to spawn rabid
+ @Override
+ public boolean isRabid() {
@@ -15,4 +15,7 @@
+ getHandle().setRabid(isRabid);
+ }
+ // Purpur end - Configurable chance for wolves to spawn rabid
}
+
public static class CraftVariant implements Variant, Handleable<WolfVariant> {
public static Variant minecraftToBukkit(WolfVariant minecraft) {