mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-31 04:46:38 +00:00
Updated Upstream (Paper/Purpur)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@6aafe29e 1.21.6 dev PaperMC/Paper@ae7c74ec tweak mob goal keys, generate missing api PaperMC/Paper@9ea1460b Revert "fix sponge-absorb deleting chest content (#12647)" Purpur Changes: PurpurMC/Purpur@eb0ba67d Updated Upstream (Paper) PurpurMC/Purpur@7c6502dc Updated Upstream (Paper) PurpurMC/Purpur@aa289e2c Updated Upstream (Paper) PurpurMC/Purpur@b1d412fb Updated Upstream (Paper) PurpurMC/Purpur@293e28a0 use empty registryaccess where context is not needed, closes #1676 PurpurMC/Purpur@452bb319 port PaperMC/Paper#12654, closes #1665 PurpurMC/Purpur@849bc79c register test subcommands used for debugging, closes #1675
This commit is contained in:
@@ -6,7 +6,7 @@ Subject: [PATCH] Purpur API Changes
|
||||
Original license: MIT
|
||||
Original project: https://github.com/PurpurMC/Purpur
|
||||
|
||||
Commit: 25d39e94edc23f338ee659655ab532ffb0d7e276
|
||||
Commit: a3c11d6845ae4a8b1cee0ee0d800e26adf5bfbff
|
||||
|
||||
Patches listed below are removed in this patch, They exists in Gale or Leaf:
|
||||
* "co/aikar/timings/TimedEventExecutor.java.patch"
|
||||
@@ -1161,13 +1161,13 @@ index 7fbfdb07585c7b28acea1f0c1f58ada0cc744441..21fcca092e2e31baa5ece0de9e44e3fa
|
||||
+ // Purpur end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java
|
||||
index b86ef7cb610f8f9bc1b5f5d5c5f637e04291aeb4..5c5e4db7f70acb3ade10b4ee8ad20fc425e819a8 100644
|
||||
index c3d37131fbd6761ac2610f7eb70643d24cdaec70..568cb4f2139b59a42fc3528a56f82fddc7d69cb8 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Villager.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Villager.java
|
||||
@@ -391,4 +391,13 @@ public interface Villager extends AbstractVillager {
|
||||
* reputation regardless of its impact and the player associated.
|
||||
@@ -408,4 +408,13 @@ public interface Villager extends AbstractVillager {
|
||||
* Demand is still updated even if all events are canceled.
|
||||
*/
|
||||
public void clearReputations();
|
||||
public void restock();
|
||||
+
|
||||
+ // Purpur start
|
||||
+ /**
|
||||
|
||||
Reference in New Issue
Block a user