mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Updated Upstream (Bukkit/CraftBukkit)

Browse source 
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:
01bb6ba7 PR-936: Add new PersistentDataContainer methods and clean up docs
bc145b90 PR-940: Create registry for banner pattern and cat type

CraftBukkit Changes:
cb2ea54de SPIGOT-7440, PR-1292: Fire EntityTeleportEvent for end gateways
4fea66e44 PR-1299: Add new PersistentDataContainer methods and clean up docs
b483a20db PR-1303: Create registry for banner pattern and cat type
4642dd526 SPIGOT-7535: Fix maps not having an ID and also call MapInitializeEvent in more places
This commit is contained in:
Jake Potrebic 2023-12-08 11:00:39 -08:00
parent f9edc4b1cd
commit 2f92d4e00e
No known key found for this signature in database
GPG key ID: ECE0B3C133C016C5
146 changed files with 141 additions and 223 deletions
Download patch file Download diff file Expand all files Collapse all files

52
patches/api/0438-Add-titleOverride-to-InventoryOpenEvent.patch Normal file
View file

@ -0,0 +1,52 @@
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() {