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

Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9018)

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:
2c64d8c4 SPIGOT-7309: Add API for jukebox inventories
a6d7e4ca PR-826: Add Sniffer API

CraftBukkit Changes:
93813509b SPIGOT-7309: Add API for jukebox inventories
2d5209e8d PR-1153: Handle teleport reason in spreadplayers command
f5b61387e SPIGOT-7308: Fix NullPointerException when calling Jukebox#setRecord()
388d458a6 SPIGOT-7306: Fix reset of coords in default teleportTo in EntityPlayer
40b87e1af PR-1150: Add Sniffer API and handle EntityItemDropEvent

Spigot Changes:
6ad4b93c SPIGOT-7298: Fix debug stick always permission left click toggle
This commit is contained in:
Jake Potrebic 2023-03-24 13:38:40 -07:00 • committed by GitHub
parent a0f548f5ec
commit 38be4f873b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
47 changed files with 90 additions and 190 deletions
Download patch file Download diff file Expand all files Collapse all files

8
patches/api/0005-Adventure.patch
View file

@ -2775,10 +2775,10 @@ index 3c2ea8fec3a748cab7f5ad9100d12bd8213ec6c9..a803bfea5400b3578bb4cf3261874e87
* Gets how much EXP the Player should have at respawn.
* <p>
diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java
index 4fb754cd7fd9b668029e2311cfaad774bb47cf80..99a45a698882acd47c725183a1f199eb1643f6e8 100644
index 629c1bf79ca3577c51d17ef8c9d36f84b1a2c360..2186507089384cb9805057c7cc1795fba7de1df3 100644
--- a/src/main/java/org/bukkit/event/inventory/InventoryType.java
+++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java
@@ -151,6 +151,18 @@ public enum InventoryType {
@@ -155,6 +155,18 @@ public enum InventoryType {
private final String title;
private final boolean isCreatable;
@ -2797,7 +2797,7 @@ index 4fb754cd7fd9b668029e2311cfaad774bb47cf80..99a45a698882acd47c725183a1f199eb
private InventoryType(int defaultSize, /*@NotNull*/ String defaultTitle) {
this(defaultSize, defaultTitle, true);
}
@@ -159,6 +171,7 @@ public enum InventoryType {
@@ -163,6 +175,7 @@ public enum InventoryType {
size = defaultSize;
title = defaultTitle;
this.isCreatable = isCreatable;
@ -2805,7 +2805,7 @@ index 4fb754cd7fd9b668029e2311cfaad774bb47cf80..99a45a698882acd47c725183a1f199eb
}
public int getDefaultSize() {
@@ -166,6 +179,7 @@ public enum InventoryType {
@@ -170,6 +183,7 @@ public enum InventoryType {
}
@NotNull