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

Updated Upstream (Bukkit/CraftBukkit) (#7604)

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:
33a2b476 PR-734: Make PlayerInventory#getItem Nullable

CraftBukkit Changes:
953d3ddc SPIGOT-3034: PlayerKickEvent.setLeaveMessage(String) doesn't actually do anything
2c47af0c SPIGOT-6963: CraftMetaBlockState#getBlockState applied TileEntity ids without the minecraft namespace prefix.
This commit is contained in:
Jake Potrebic 2022-03-16 08:57:51 -07:00 • committed by GitHub
parent f35a0ceb93
commit 1c5f8b0fce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
80 changed files with 295 additions and 248 deletions
Download patch file Download diff file Expand all files Collapse all files

4
patches/server/0217-Refresh-player-inventory-when-cancelling-PlayerInter.patch
View file

@ -16,10 +16,10 @@ Refresh the player inventory when PlayerInteractEntityEvent is
cancelled to avoid this problem.
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index b280cb3250928367efa02cd1d9ce1607e6fb547d..dced761b1f74de28a784dfcffed1bbc002e5a586 100644
index 2faa2a9980d7139695be3583f80b05d99b6179d8..76628de17e8fb374801b5b9e25f7ff6bd1465c30 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2234,6 +2234,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -2235,6 +2235,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
}
if (event.isCancelled()) {