Updated Upstream (Bukkit/CraftBukkit)

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
2b4b6d14 PR-1023: Convert InventoryView to interface

CraftBukkit Changes:
68603b1c1 Use expanded interaction ranges for traced interact events
eae9f760c PR-1414: Convert InventoryView to interface
ee9eafe67 Fix Implementation for DamageSource#isIndirect for internal custom causing entity
This commit is contained in:
Bjarne Koll
2024-06-16 17:21:14 +02:00
parent 35a678ddb3
commit d04e9fafa4
11 changed files with 57 additions and 57 deletions

View File

@@ -4310,9 +4310,9 @@ diff --git a/src/main/java/org/bukkit/inventory/InventoryView.java b/src/main/ja
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/inventory/InventoryView.java
+++ b/src/main/java/org/bukkit/inventory/InventoryView.java
@@ -0,0 +0,0 @@ public abstract class InventoryView {
return getPlayer().setWindowProperty(prop, value);
}
@@ -0,0 +0,0 @@ public interface InventoryView {
*/
public boolean setProperty(@NotNull Property prop, int value);
+ // Paper start
/**
@@ -4321,7 +4321,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
* @return The title.
*/
@NotNull
+ public /*abstract*/ net.kyori.adventure.text.Component title() {
+ default net.kyori.adventure.text.Component title() {
+ return net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(this.getTitle());
+ }
+ // Paper end
@@ -4334,7 +4334,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ */
+ @Deprecated // Paper
+ @NotNull
public abstract String getTitle();
public String getTitle();
/**
diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java