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
|
2024-05-23 19:32:02 +02:00
|
|
|
Subject: [PATCH] Add hasCollision methods to various places
|
2021-11-06 20:43:24 +01:00
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
|
2024-05-23 19:32:02 +02:00
|
|
|
index 1df815c2e430a308baea08c9a7f3ca43377dc16e..195bd298cfc2d43720550d5bf5a3347c064e9a7a 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
|
2024-05-23 19:32:02 +02:00
|
|
|
@@ -4788,6 +4788,21 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
|
2021-11-06 20:43:24 +01:00
|
|
|
}
|
2024-05-23 19:32:02 +02:00
|
|
|
// Paper end - item default attributes API
|
|
|
|
|
|
|
|
+ // Paper start - isCollidable API
|
2021-11-06 20:43:24 +01:00
|
|
|
+ /**
|
|
|
|
+ * Checks if this material is collidable.
|
|
|
|
+ *
|
|
|
|
+ * @return true if collidable
|
|
|
|
+ * @throws IllegalArgumentException if {@link #isBlock()} is false
|
|
|
|
+ */
|
|
|
|
+ public boolean isCollidable() {
|
2024-05-23 19:32:02 +02:00
|
|
|
+ if (this.isBlock()) {
|
|
|
|
+ return this.asBlockType().hasCollision();
|
|
|
|
+ }
|
|
|
|
+ throw new IllegalArgumentException(this + " isn't a block type");
|
2021-11-06 20:43:24 +01:00
|
|
|
+ }
|
2024-05-23 19:32:02 +02:00
|
|
|
+ // Paper end - isCollidable API
|
2021-11-06 20:43:24 +01:00
|
|
|
+
|
2024-05-23 19:32:02 +02:00
|
|
|
/**
|
|
|
|
* Do not use for any reason.
|
|
|
|
*
|
2021-11-06 20:43:24 +01:00
|
|
|
diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
|
Updated Upstream (Bukkit/CraftBukkit) (#10242)
* Updated Upstream (Bukkit/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
Bukkit Changes:
a6a9d2a4 Remove some old ApiStatus.Experimental annotations
be72314c SPIGOT-7300, PR-829: Add new DamageSource API providing enhanced information about entity damage
b252cf05 SPIGOT-7576, PR-970: Add methods in MushroomCow to change stew effects
b1c689bd PR-902: Add Server#isLoggingIPs to get log-ips configuration
08f86d1c PR-971: Add Player methods for client-side potion effects
2e3024a9 PR-963: Add API for in-world structures
a23292a7 SPIGOT-7530, PR-948: Improve Resource Pack API with new 1.20.3 functionality
1851857b SPIGOT-3071, PR-969: Add entity spawn method with spawn reason
cde4c52a SPIGOT-5553, PR-964: Add EntityKnockbackEvent
CraftBukkit Changes:
38fd4bd50 Fix accidentally renamed internal damage method
80f0ce4be SPIGOT-7300, PR-1180: Add new DamageSource API providing enhanced information about entity damage
7e43f3b16 SPIGOT-7581: Fix typo in BlockMushroom
ea14b7d90 SPIGOT-7576, PR-1347: Add methods in MushroomCow to change stew effects
4c687f243 PR-1259: Add Server#isLoggingIPs to get log-ips configuration
22a541a29 Improve support for per-world game rules
cb7dccce2 PR-1348: Add Player methods for client-side potion effects
b8d6109f0 PR-1335: Add API for in-world structures
4398a1b5b SPIGOT-7577: Make CraftWindCharge#explode discard the entity
e74107678 Fix Crafter maximum stack size
0bb0f4f6a SPIGOT-7530, PR-1314: Improve Resource Pack API with new 1.20.3 functionality
4949f556d SPIGOT-3071, PR-1345: Add entity spawn method with spawn reason
20ac73ca2 PR-1353: Fix Structure#place not working as documented with 0 palette
3c1b77871 SPIGOT-6911, PR-1349: Change max book length in CraftMetaBook
333701839 SPIGOT-7572: Bee nests generated without bees
f48f4174c SPIGOT-5553, PR-1336: Add EntityKnockbackEvent
2024-02-11 22:28:00 +01:00
|
|
|
index b5fe76a6353816a2d009dfa5921f8ada92984f34..42cc4f2ee960c0abf9c6688aeee4150754612c32 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
|
2024-04-23 19:02:08 +02:00
|
|
|
index fd4a9bdcfb6775dfbdb7492e6c9eb90722d2ecdc..e573e70d9e74e444783a7363e6cdac126124d86d 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
|
2024-04-23 19:02:08 +02:00
|
|
|
@@ -245,4 +245,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
|
|
|
|
}
|
2024-05-23 19:32:02 +02:00
|
|
|
diff --git a/src/main/java/org/bukkit/block/BlockType.java b/src/main/java/org/bukkit/block/BlockType.java
|
|
|
|
index d4e824ad18714b951cf161031a9566e6796ab507..61a73e813f7c14c61fac358e96aaaa64c41e560b 100644
|
|
|
|
--- a/src/main/java/org/bukkit/block/BlockType.java
|
|
|
|
+++ b/src/main/java/org/bukkit/block/BlockType.java
|
|
|
|
@@ -3611,4 +3611,13 @@ public interface BlockType extends Keyed, Translatable, net.kyori.adventure.tran
|
|
|
|
@Override
|
|
|
|
@NotNull String getTranslationKey();
|
|
|
|
// Paper end - add Translatable
|
|
|
|
+
|
|
|
|
+ // Paper start - hasCollision API
|
|
|
|
+ /**
|
|
|
|
+ * Checks if this block type has collision.
|
|
|
|
+ * <p>
|
|
|
|
+ * @return false if this block never has collision, true if it <b>might</b> have collision
|
|
|
|
+ */
|
|
|
|
+ boolean hasCollision();
|
|
|
|
+ // Paper end - hasCollision API
|
|
|
|
}
|