diff options
| author | Jake Potrebic <[email protected]> | 2023-12-16 18:09:28 -0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-12-16 18:09:28 -0800 |
| commit | de04cbced5441dfa9847b02ab28fe7c4b54f054c (patch) | |
| tree | 4052db5a18ee365b9c1b9ce948a7d8afe45f7e63 /patches/api/0442-Add-API-to-get-the-collision-shape-of-a-block-before.patch | |
| parent | f1820dc80a02009980e6466ea5847933861b911a (diff) | |
| download | Paper-de04cbced5441dfa9847b02ab28fe7c4b54f054c.tar.gz Paper-de04cbced5441dfa9847b02ab28fe7c4b54f054c.zip | |
Updated Upstream (Bukkit/CraftBukkit) (#10034)
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:
f29cb801 Separate checkstyle-suppressions file is not required
86f99bbe SPIGOT-7540, PR-946: Add ServerTickManager API
d4119585 SPIGOT-6903, PR-945: Add BlockData#getMapColor
b7a2ed41 SPIGOT-7530, PR-947: Add Player#removeResourcePack
9dd56255 SPIGOT-7527, PR-944: Add WindCharge#explode()
994a6163 Attempt upgrade of resolver libraries
CraftBukkit Changes:
b3b43a6ad Add Checkstyle check for unused imports
13fb3358e SPIGOT-7544: Scoreboard#getEntries() doesn't get entries but class names
3dda99c06 SPIGOT-7540, PR-1312: Add ServerTickManager API
2ab4508c0 SPIGOT-6903, PR-1311: Add BlockData#getMapColor
1dbdbbed4 PR-1238: Remove unnecessary sign ticking
659728d2a MC-264285, SPIGOT-7439, PR-1237: Fix unbreakable flint and steel is completely consumed while igniting creeper
e37e29ce0 Increase outdated build delay
c00438b39 SPIGOT-7530, PR-1313: Add Player#removeResourcePack
492dd80ce SPIGOT-7527, PR-1310: Add WindCharge#explode()
e11fbb9d7 Upgrade MySQL driver
9f3a0bd2a Attempt upgrade of resolver libraries
60d16d7ca PR-1306: Centralize Bukkit and Minecraft entity conversion
Spigot Changes:
06d602e7 Rebuild patches
Diffstat (limited to 'patches/api/0442-Add-API-to-get-the-collision-shape-of-a-block-before.patch')
| -rw-r--r-- | patches/api/0442-Add-API-to-get-the-collision-shape-of-a-block-before.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/api/0442-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/api/0442-Add-API-to-get-the-collision-shape-of-a-block-before.patch index 8c93339e29..9528da025b 100644 --- a/patches/api/0442-Add-API-to-get-the-collision-shape-of-a-block-before.patch +++ b/patches/api/0442-Add-API-to-get-the-collision-shape-of-a-block-before.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Add API to get the collision shape of a block before it's diff --git a/src/main/java/org/bukkit/block/data/BlockData.java b/src/main/java/org/bukkit/block/data/BlockData.java -index 31111cea5ffd018c3c011c1f3b8befbbd33db5e5..66903e0fa65052ede789a163dad723ba05a2cc8c 100644 +index d30ac3edc475796cf7f1d7ea04f665eef4ce755f..647536e1f1a323447dc510b2406bb39c22083945 100644 --- a/src/main/java/org/bukkit/block/data/BlockData.java +++ b/src/main/java/org/bukkit/block/data/BlockData.java -@@ -204,6 +204,19 @@ public interface BlockData extends Cloneable { +@@ -205,6 +205,19 @@ public interface BlockData extends Cloneable { */ boolean isFaceSturdy(@NotNull BlockFace face, @NotNull BlockSupport support); @@ -27,5 +27,5 @@ index 31111cea5ffd018c3c011c1f3b8befbbd33db5e5..66903e0fa65052ede789a163dad723ba + // Paper end + /** - * Gets the material that a player would use to place this block. - * <p> + * Gets the color this block should appear as when rendered on a map. + * |