Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@7ee1cc11 Add ignite and fuse API for SulfurCube (#13944)
PaperMC/Paper@77202ea9 move a bunch of stuff out of unsafe
PaperMC/Paper@000cf99e finish migration to api bridge
PaperMC/Paper@8e5d42fa fix NPE in PaperComponents.resolveWithContext
PaperMC/Paper@f45bc608 fix infinite loop for any explosion hitting bedrock
PaperMC/Paper@6631e645 set dead flag again for dragon
This commit is contained in:
granny
2026-06-10 15:23:34 -07:00
parent c94a2c9b86
commit e3f5a93f1c
11 changed files with 26 additions and 26 deletions

View File

@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
@@ -214,7 +_,7 @@
@@ -215,7 +_,7 @@
String version = Bukkit.getVersion();
// Paper start
if (version.startsWith("null")) { // running from ide?
@@ -9,7 +9,7 @@
return;
}
setVersionMessage(getVersionFetcher().getVersionMessage(version));
@@ -255,9 +_,11 @@
@@ -256,9 +_,11 @@
// Paper start
private void setVersionMessage(final @NotNull Component msg) {
lastCheck = System.currentTimeMillis();

View File

@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -24,6 +_,13 @@
@@ -23,6 +_,13 @@
import org.bukkit.persistence.PersistentDataContainer;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -14,7 +14,7 @@
/**
* Represents a stack of items.
@@ -1372,4 +_,482 @@
@@ -1374,4 +_,482 @@
return this.craftDelegate.matchesWithoutData(item, excludeTypes, ignoreCount);
}
// Paper end - data component API