From 0eec20771a1d5b399093eba16fe468215a5bea73 Mon Sep 17 00:00:00 2001 From: granny Date: Fri, 14 Mar 2025 21:06:07 -0700 Subject: [PATCH] rebuild paper api file patches --- .../org/bukkit/command/defaults/VersionCommand.java.patch | 4 ++-- .../src/main/java/org/bukkit/entity/LivingEntity.java.patch | 2 +- .../src/main/java/org/bukkit/entity/Villager.java.patch | 5 ++--- .../files/src/main/java/org/bukkit/entity/Wither.java.patch | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/purpur-api/paper-patches/files/src/main/java/org/bukkit/command/defaults/VersionCommand.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/command/defaults/VersionCommand.java.patch index b424f2eb9..b781c954e 100644 --- a/purpur-api/paper-patches/files/src/main/java/org/bukkit/command/defaults/VersionCommand.java.patch +++ b/purpur-api/paper-patches/files/src/main/java/org/bukkit/command/defaults/VersionCommand.java.patch @@ -1,6 +1,6 @@ --- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java +++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java -@@ -215,7 +_,7 @@ +@@ -213,7 +_,7 @@ String version = Bukkit.getVersion(); // Paper start if (version.startsWith("null")) { // running from ide? @@ -9,7 +9,7 @@ return; } setVersionMessage(getVersionFetcher().getVersionMessage(version)); -@@ -256,9 +_,11 @@ +@@ -254,9 +_,11 @@ // Paper start private void setVersionMessage(final @NotNull Component msg) { lastCheck = System.currentTimeMillis(); diff --git a/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/LivingEntity.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/LivingEntity.java.patch index cb9f337fe..2ec452396 100644 --- a/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/LivingEntity.java.patch +++ b/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/LivingEntity.java.patch @@ -1,6 +1,6 @@ --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -1476,4 +_,20 @@ +@@ -1468,4 +_,20 @@ */ boolean canUseEquipmentSlot(org.bukkit.inventory.@NotNull EquipmentSlot slot); // Paper end - Expose canUseSlot diff --git a/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Villager.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Villager.java.patch index 90aac0f52..f27a5a7e9 100644 --- a/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Villager.java.patch +++ b/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Villager.java.patch @@ -1,12 +1,11 @@ --- a/src/main/java/org/bukkit/entity/Villager.java +++ b/src/main/java/org/bukkit/entity/Villager.java -@@ -367,4 +_,14 @@ +@@ -365,4 +_,13 @@ + * reputation regardless of its impact and the player associated. */ public void clearReputations(); - // Paper end + + // Purpur start -+ + /** + * Check if villager is currently lobotomized + * diff --git a/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Wither.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Wither.java.patch index 1080c3d6d..e2f1daf25 100644 --- a/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Wither.java.patch +++ b/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Wither.java.patch @@ -1,9 +1,9 @@ --- a/src/main/java/org/bukkit/entity/Wither.java +++ b/src/main/java/org/bukkit/entity/Wither.java -@@ -107,4 +_,20 @@ +@@ -105,4 +_,20 @@ + * This is called in vanilla directly after spawning the wither. */ void enterInvulnerabilityPhase(); - // Paper end + + // Purpur start + /**