diff options
Diffstat (limited to 'patches/api/0319-Add-isCollidable-methods-to-various-places.patch')
-rw-r--r-- | patches/api/0319-Add-isCollidable-methods-to-various-places.patch | 82 |
1 files changed, 82 insertions, 0 deletions
diff --git a/patches/api/0319-Add-isCollidable-methods-to-various-places.patch b/patches/api/0319-Add-isCollidable-methods-to-various-places.patch new file mode 100644 index 0000000000..a3abc4242a --- /dev/null +++ b/patches/api/0319-Add-isCollidable-methods-to-various-places.patch @@ -0,0 +1,82 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jake Potrebic <[email protected]> +Date: Thu, 4 Nov 2021 11:50:35 -0700 +Subject: [PATCH] Add isCollidable methods to various places + + +diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java +index 64ca3c676703eed55b4ac8a2d4561d483c6935b1..9f86ad25a57b3f6e6bda1ce657833837cb3b2292 100644 +--- a/src/main/java/org/bukkit/Material.java ++++ b/src/main/java/org/bukkit/Material.java +@@ -4735,6 +4735,16 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla + public Multimap<Attribute, AttributeModifier> getItemAttributes(@NotNull EquipmentSlot equipmentSlot) { + return Bukkit.getUnsafe().getItemAttributes(this, equipmentSlot); + } ++ ++ /** ++ * Checks if this material is collidable. ++ * ++ * @return true if collidable ++ * @throws IllegalArgumentException if {@link #isBlock()} is false ++ */ ++ public boolean isCollidable() { ++ return Bukkit.getUnsafe().isCollidable(this); ++ } + // Paper end + + /** +diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java +index 5d4721595a24c8c970f2500fc805c3efc4508157..434fde52986ba07d7209ff47483f74fe31e8ebe7 100644 +--- a/src/main/java/org/bukkit/UnsafeValues.java ++++ b/src/main/java/org/bukkit/UnsafeValues.java +@@ -230,5 +230,14 @@ public interface UnsafeValues { + * @throws IllegalArgumentException if the entity does not exist of have default attributes (use {@link #hasDefaultEntityAttributes(NamespacedKey)} first) + */ + @org.jetbrains.annotations.NotNull org.bukkit.attribute.Attributable getDefaultEntityAttributes(@org.jetbrains.annotations.NotNull NamespacedKey entityKey); ++ ++ /** ++ * Checks if this material is collidable. ++ * ++ * @param material the material to check ++ * @return true if collidable ++ * @throws IllegalArgumentException if {@link Material#isBlock()} is false ++ */ ++ boolean isCollidable(@org.jetbrains.annotations.NotNull Material material); + // Paper end + } +diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java +index b5fe76a6353816a2d009dfa5921f8ada92984f34..42cc4f2ee960c0abf9c6688aeee4150754612c32 100644 +--- a/src/main/java/org/bukkit/block/Block.java ++++ b/src/main/java/org/bukkit/block/Block.java +@@ -482,6 +482,13 @@ public interface Block extends Metadatable, Translatable, net.kyori.adventure.tr + * @return true if block is solid + */ + boolean isSolid(); ++ ++ /** ++ * Checks if this block is collidable. ++ * ++ * @return true if collidable ++ */ ++ boolean isCollidable(); + // Paper end + + /** +diff --git a/src/main/java/org/bukkit/block/BlockState.java b/src/main/java/org/bukkit/block/BlockState.java +index a4f0a5270693e1c4af4fad827fa0a2ce753e07b5..c439cf0bb6c50db2b3304c60e50046f096392f9f 100644 +--- a/src/main/java/org/bukkit/block/BlockState.java ++++ b/src/main/java/org/bukkit/block/BlockState.java +@@ -235,4 +235,13 @@ public interface BlockState extends Metadatable { + * or 'virtual' (e.g. on an itemstack) + */ + boolean isPlaced(); ++ ++ // Paper start ++ /** ++ * Checks if this block state is collidable. ++ * ++ * @return true if collidable ++ */ ++ boolean isCollidable(); ++ // Paper end + } |