diff options
| author | Nassim Jahnke <[email protected]> | 2024-01-26 20:17:06 +0100 |
|---|---|---|
| committer | Nassim Jahnke <[email protected]> | 2024-01-26 20:19:17 +0100 |
| commit | fe53b0e76fc640072ff7866da496b439032c1684 (patch) | |
| tree | 7867a2f4807e34c896052ce6d8294d8edcfe9218 /patches/server/0414-Brand-support.patch | |
| parent | bd2fd615ceb7c65f6837317bc83bf9cbfc425b42 (diff) | |
| download | Paper-fe53b0e76fc640072ff7866da496b439032c1684.tar.gz Paper-fe53b0e76fc640072ff7866da496b439032c1684.zip | |
Updated Upstream (Bukkit/CraftBukkit/Spigot)
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:
1d522878 PR-966: Introduce getRespawnLocation as a replacement for getBedSpawnLocation
cc01b745 PR-965: Add DragonBattle#setPreviouslyKilled
28e3702f SPIGOT-6921, PR-957: Add methods to remove all enchantments on an ItemStack
8872404e PR-961: Add BlockData#copyTo
4054cc7b PR-956: Add method to get an offline player's location
CraftBukkit Changes:
292ec79e0 SPIGOT-7568: Call EntityChangeBlockEvent for DecoratedPot
b44bf5aa8 SPIGOT-7575: SuspiciousStewMeta creates invalid PotionEffect data
161784713 PR-1340: Centralize the conversion from and to Minecraft / Bukkit registry items even more and add a test case for them
b93c5a30d PR-1338: Introduce getRespawnLocation as a replacement for getBedSpawnLocation
fb973486c SPIGOT-7570: PrepareItemCraftEvent#isRepair() always returns false
c9c24535e PR-1337: Add DragonBattle#setPreviouslyKilled
c8b4da803 SPIGOT-6921, PR-1330: Add methods to remove all enchantments on an ItemStack
95bc1c4f5 PR-1333: Add BlockData#copyTo
36e2f9ce1 PR-1329: Add method to get an offline player's location
Spigot Changes:
c198da22 SPIGOT-7563: Update to latest release of bungeecord-chat
Diffstat (limited to 'patches/server/0414-Brand-support.patch')
| -rw-r--r-- | patches/server/0414-Brand-support.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0414-Brand-support.patch b/patches/server/0414-Brand-support.patch index a0b82b4c27..e6b4bbb729 100644 --- a/patches/server/0414-Brand-support.patch +++ b/patches/server/0414-Brand-support.patch @@ -57,10 +57,10 @@ index e69043316372d98b122ed3788fda79cdd36849e8..6597e6e9987ddb5906909c22704fdfb6 } catch (Exception ex) { ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index febbb35077811c6cfd4101500aad24c447f4cae1..7e3f0cacbe1b562c73b5d62bfa81b832af5bbd93 100644 +index dcea3f827a79de3581adff51f34220a1d656e8e9..8a289cd0876a8c063a2b5f75ce8eb41f4be98acf 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -2990,6 +2990,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -3005,6 +3005,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { // Paper end }; |