aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0232-Optimize-CraftBlockData-Creation.patch
diff options
context:
space:
mode:
authorBjarne Koll <[email protected]>2024-12-03 15:47:48 +0100
committerGitHub <[email protected]>2024-12-03 15:47:48 +0100
commitda7138233f6392e791d790d1c3407414c855f9c2 (patch)
tree932f0ca91d60c5a0c7ec4fe6a2c407ff7c6061eb /patches/server/0232-Optimize-CraftBlockData-Creation.patch
parentc2294d7067959d264eb8ad275557f194a3e2656f (diff)
downloadPaper-da7138233f6392e791d790d1c3407414c855f9c2.tar.gz
Paper-da7138233f6392e791d790d1c3407414c855f9c2.zip
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#11702)1.21.3
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: ed0ec489 SPIGOT-7965: Unknown TransformReason for Hoglins 9db03457 SPIGOT-7964: Fix typo in Deprecation annotation d14119af PR-1082: Add "since" to Deprecation annotations e8a318d4 PR-1067: Add method to get Advancement requirements CraftBukkit Changes: 40dd796db SPIGOT-7971: NotSerializableException on serialize CraftUseCooldownComponent fa85c5e0a SPIGOT-7968: ProjectileHitEvent not trigerred when arrow hits entity b75b792ec SPIGOT-7970: World#getMaxHeight() returning incorrect value 2b9a094bb SPIGOT-7965: Unknown TransformReason for Hoglins fd3f5a380 SPIGOT-7966: Some trees do not generate with #generateTree f2822317c PR-1515: Add a Class reader and Class node argument provider 07abf6852 PR-1514: Add a test case for ClassTraverser a7577cb24 Fix Inventory#addItem not respecting max stack size 066a74e74 PR-1490: Add method to get Advancement requirements 4a1df30e4 PR-1512: Test Art class based on specific values instead of the implementation, to better catch implementation changes 53254c56f PR-1503: Simplify CAS loop to getAndSet e9447dc5e Make BlockDataMeta#setBlockData hide unspecified states dd08a7120 SPIGOT-7960: Fix inconsistency between natural item drop coordinates e9e8ed753 SPIGOT-7960: Improve natural item drop methods Spigot Changes: 60c9969b Rebuild patches
Diffstat (limited to 'patches/server/0232-Optimize-CraftBlockData-Creation.patch')
-rw-r--r--patches/server/0232-Optimize-CraftBlockData-Creation.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0232-Optimize-CraftBlockData-Creation.patch b/patches/server/0232-Optimize-CraftBlockData-Creation.patch
index 03c51206ce..d66c9bf468 100644
--- a/patches/server/0232-Optimize-CraftBlockData-Creation.patch
+++ b/patches/server/0232-Optimize-CraftBlockData-Creation.patch
@@ -26,10 +26,10 @@ index 0bae4e8d1e9fcc4608b3ef1c981c65f3b03de22b..83a3c877f2969549ea154ad86687e96f
private boolean calculateSolid() {
if (((Block) this.owner).properties.forceSolidOn) {
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 da39a252be9b77c81c07d6b67da9f2380f9445a8..c53dbcfde62ae8e2f019e854c336ce4a60346dc9 100644
+index e3987a1947548f152daaa9c7ad1d894a13eacbd8..b472cd2d8ca0885ca5f2c42787d796f3e27ec413 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-@@ -574,7 +574,17 @@ public class CraftBlockData implements BlockData {
+@@ -578,7 +578,17 @@ public class CraftBlockData implements BlockData {
return craft;
}