2021-11-06 20:43:24 +01:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
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
2023-09-29 02:28:26 +02:00
index 9be00bc616b1c6ad9619d9a48d5870f6d7ffb917..da6e36a16e609272b60fc41ff69a6fa3c34926c0 100644
2021-11-06 20:43:24 +01:00
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
2023-09-23 04:06:03 +02:00
@@ -4489,6 +4489,16 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
2022-01-01 04:05:42 +01:00
public Multimap<Attribute, AttributeModifier> getItemAttributes(@NotNull EquipmentSlot equipmentSlot) {
2021-11-06 20:43:24 +01:00
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
2023-10-22 21:12:00 +02:00
index f08e03c71f1e59d31a22822701b4e9ae6cc1429d..7dc808f94c42e821fa125073b1a9b853e16d5b41 100644
2021-11-06 20:43:24 +01:00
--- a/src/main/java/org/bukkit/UnsafeValues.java
+++ b/src/main/java/org/bukkit/UnsafeValues.java
2023-10-22 21:12:00 +02:00
@@ -213,5 +213,14 @@ public interface UnsafeValues {
2021-11-06 20:43:24 +01:00
* @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
2023-10-01 02:20:51 +02:00
index 6de4c858ff6e542daa0879092e4f99a948225964..05fd2aa8a1639598b488712d2fe5f739019f41dc 100644
2021-11-06 20:43:24 +01:00
--- a/src/main/java/org/bukkit/block/Block.java
+++ b/src/main/java/org/bukkit/block/Block.java
2023-02-15 23:10:14 +01:00
@@ -482,6 +482,13 @@ public interface Block extends Metadatable, Translatable, net.kyori.adventure.tr
2021-11-06 20:43:24 +01:00
* @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
2023-09-29 02:28:26 +02:00
index a4f0a5270693e1c4af4fad827fa0a2ce753e07b5..c439cf0bb6c50db2b3304c60e50046f096392f9f 100644
2021-11-06 20:43:24 +01:00
--- a/src/main/java/org/bukkit/block/BlockState.java
+++ b/src/main/java/org/bukkit/block/BlockState.java
2023-09-29 02:28:26 +02:00
@@ -235,4 +235,13 @@ public interface BlockState extends Metadatable {
2021-11-06 20:43:24 +01:00
* 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
}