diff options
author | Josh Roy <[email protected]> | 2021-11-23 18:07:41 -0500 |
---|---|---|
committer | MiniDigger | Martin <[email protected]> | 2021-11-30 19:26:33 +0100 |
commit | 06629d562b56e97f4be1b662aea27b51cb0063fc (patch) | |
tree | f684b08bc4ff1c77318f2cf3fd1767f88e564350 /patches/server/0166-API-to-get-a-BlockState-without-a-snapshot.patch | |
parent | 98330439e8777124d6d11fc9812a941390af5982 (diff) | |
download | Paper-06629d562b56e97f4be1b662aea27b51cb0063fc.tar.gz Paper-06629d562b56e97f4be1b662aea27b51cb0063fc.zip |
Updated Upstream (CraftBukkit)
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
CraftBukkit Changes:
a58fde42 Fix crash with composters
a11ec5d7 Remove unnecessary CraftBlock creation in CraftRegionAccessor#setBlock
Diffstat (limited to 'patches/server/0166-API-to-get-a-BlockState-without-a-snapshot.patch')
-rw-r--r-- | patches/server/0166-API-to-get-a-BlockState-without-a-snapshot.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0166-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/server/0166-API-to-get-a-BlockState-without-a-snapshot.patch index de82e83aaf..105653f000 100644 --- a/patches/server/0166-API-to-get-a-BlockState-without-a-snapshot.patch +++ b/patches/server/0166-API-to-get-a-BlockState-without-a-snapshot.patch @@ -51,10 +51,10 @@ index 67315a86e5db51029d0f355c6dc223e93e4141db..29167adb4eeb83c108445c37e01dc403 return null; } diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -index 155c0dee5d3485310c60b4f4c3240d1ac07eb873..3ba1c033e00b56abcef005c04fa88cd24dae93ad 100644 +index d8b9a8276204ad8a2f045af9fe94185dbf150bc6..3250559589eb4db7b3df828144cee81a19651842 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -@@ -314,7 +314,20 @@ public class CraftBlock implements Block { +@@ -317,7 +317,20 @@ public class CraftBlock implements Block { @Override public BlockState getState() { |