mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-01 16:29:45 +01:00
71c84c8132
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: 9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent 258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD CraftBukkit Changes: 98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent 5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class 76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor Spigot Changes: e9ec5485 Rebuild patches f1b62e0c Rebuild patches
53 lines
2.2 KiB
Diff
53 lines
2.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Fri, 4 Mar 2022 12:45:21 -0800
|
|
Subject: [PATCH] Add titleOverride to InventoryOpenEvent
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/event/inventory/InventoryOpenEvent.java b/src/main/java/org/bukkit/event/inventory/InventoryOpenEvent.java
|
|
index ceae092eb782698803c6c3df41267dde20ba62b2..8e2afeab4c62724148e8bb0c83fb7eec569c7a0c 100644
|
|
--- a/src/main/java/org/bukkit/event/inventory/InventoryOpenEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/inventory/InventoryOpenEvent.java
|
|
@@ -12,6 +12,7 @@ import org.jetbrains.annotations.NotNull;
|
|
public class InventoryOpenEvent extends InventoryEvent implements Cancellable {
|
|
private static final HandlerList handlers = new HandlerList();
|
|
private boolean cancelled;
|
|
+ private net.kyori.adventure.text.Component titleOverride; // Paper
|
|
|
|
public InventoryOpenEvent(@NotNull InventoryView transaction) {
|
|
super(transaction);
|
|
@@ -56,6 +57,33 @@ public class InventoryOpenEvent extends InventoryEvent implements Cancellable {
|
|
cancelled = cancel;
|
|
}
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Gets the title override set by another event or null
|
|
+ * if not set.
|
|
+ *
|
|
+ * @return the title override or null
|
|
+ */
|
|
+ public net.kyori.adventure.text.@org.jetbrains.annotations.Nullable Component titleOverride() {
|
|
+ return this.titleOverride;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sets the title override or clears the override.
|
|
+ * <p>
|
|
+ * This is only the title sent to the client in the open packet, this doesn't change
|
|
+ * the title returned by {@link InventoryView#title()}, hence "override".
|
|
+ * <p>
|
|
+ * <b>NOTE:</b> Horse inventories are a special case where setting this will
|
|
+ * have no effect. Horse inventory titles are set by the horse display name.
|
|
+ *
|
|
+ * @param titleOverride the title override or null
|
|
+ */
|
|
+ public void titleOverride(net.kyori.adventure.text.@org.jetbrains.annotations.Nullable Component titleOverride) {
|
|
+ this.titleOverride = titleOverride;
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
@NotNull
|
|
@Override
|
|
public HandlerList getHandlers() {
|