mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-06-21 17:57:50 +02:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@e2c7e5cf Limit projectiles size PaperMC/Paper@ca5e948a Fix override of new item for Firework entity (#13891) PaperMC/Paper@20938c72 Set Obsolete the use of PotionMeta in Potion entities (#13892) PaperMC/Paper@76d2ac75 [ci/skip] Fix AreaEffectCloud doc comments (#13926) PaperMC/Paper@f414ba89 run generator PaperMC/Paper@9194ea20 fix duplicate goal name for cube mobs PaperMC/Paper@b0c2992a Fix "-1 releases behind" being logged for early snapshots PaperMC/Paper@46a24d6a Merge remote-tracking branch 'origin/main' into dev/26.2 PaperMC/Paper@2c0dfb53 Fix emptying sulfur cube bucket doesn't work PaperMC/Paper@b1b09191 update todo PaperMC/Paper@f23495f0 Commodore rewriting for breaking slime API change PaperMC/Paper@9a1623b3 fix tests PaperMC/Paper@611a0ab5 Update to 26.2-pre-4 PaperMC/Paper@87cc35db delegate more stuff to CraftItemStack PaperMC/Paper@8ea9659a bump built-in pack and regenerate tags PaperMC/Paper@46cc8588 fix dispense events a bit PaperMC/Paper@5c5ff5c8 remove redundant bed updates PaperMC/Paper@1b087229 Unapply hopper patch PaperMC/Paper@c600b162 skip POI cleanup when place event is cancelled for now
This commit is contained in:
@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur config files
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index f9fd6bb7e60d31eeb52e0025b9ff4ceb34e789f1..5a3d675862a4a9d6efd86052d13081d6e142f7c4 100644
|
||||
index b7f4c4efad7335d1c02d1315c64ba9953f3f05c9..81484f52feea2ccf8b9e7c791b976561a1a3e5f6 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -2444,6 +2444,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
@@ -2443,6 +2443,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
}
|
||||
// Paper end
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/src/generated/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
|
||||
+++ b/src/generated/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
|
||||
@@ -450,6 +_,26 @@
|
||||
@@ -455,6 +_,26 @@
|
||||
|
||||
GoalKey<Zombie> ZOMBIE_ATTACK_TURTLE_EGG = create("zombie_attack_turtle_egg", Zombie.class);
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/src/main/java/org/bukkit/Material.java
|
||||
+++ b/src/main/java/org/bukkit/Material.java
|
||||
@@ -3707,4 +_,40 @@
|
||||
@@ -3738,4 +_,40 @@
|
||||
return this.asItemType().getDefaultDataTypes();
|
||||
}
|
||||
// Paper end - data component API
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -2780,4 +_,125 @@
|
||||
@@ -2779,4 +_,125 @@
|
||||
*/
|
||||
void allowPausing(@NotNull org.bukkit.plugin.Plugin plugin, boolean value);
|
||||
// Paper end - API to check if the server is sleeping
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
/**
|
||||
* Represents a stack of items.
|
||||
@@ -1373,4 +_,482 @@
|
||||
@@ -1372,4 +_,482 @@
|
||||
return this.craftDelegate.matchesWithoutData(item, excludeTypes, ignoreCount);
|
||||
}
|
||||
// Paper end - data component API
|
||||
|
||||
Reference in New Issue
Block a user