aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0779-Block-Ticking-API.patch
diff options
context:
space:
mode:
authorNassim Jahnke <[email protected]>2024-01-26 20:17:06 +0100
committerNassim Jahnke <[email protected]>2024-01-26 20:19:17 +0100
commitfe53b0e76fc640072ff7866da496b439032c1684 (patch)
tree7867a2f4807e34c896052ce6d8294d8edcfe9218 /patches/server/0779-Block-Ticking-API.patch
parentbd2fd615ceb7c65f6837317bc83bf9cbfc425b42 (diff)
downloadPaper-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/0779-Block-Ticking-API.patch')
-rw-r--r--patches/server/0779-Block-Ticking-API.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0779-Block-Ticking-API.patch b/patches/server/0779-Block-Ticking-API.patch
index 6387ad09be..9afbc4d4b1 100644
--- a/patches/server/0779-Block-Ticking-API.patch
+++ b/patches/server/0779-Block-Ticking-API.patch
@@ -31,10 +31,10 @@ index 6d10396347b69d9243ab902ecc68ede93fa17b7d..0a96b00a98227714ef99005e0a223765
// Paper end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-index 20dcbea3bb06e637a88d81ed09138b57797e270f..d5719d943946acd77dc9b26299c9f3d12d86062f 100644
+index a4252f9078c3ab7e458504496ebcdeb6875724d1..37c5d66dafd877d2231c8d191f5a84748bf24551 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-@@ -718,4 +718,11 @@ public class CraftBlockData implements BlockData {
+@@ -735,4 +735,11 @@ public class CraftBlockData implements BlockData {
return speed;
}
// Paper end - destroy speed API