56 lines
2.6 KiB
Diff
56 lines
2.6 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
||
|
|
Date: Thu, 4 Nov 2021 11:50:40 -0700
|
||
|
|
Subject: [PATCH] Add isCollidable methods to various places
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
|
||
|
|
index e3944d0f4fd18ef6c545dc4a131c0b120dff753a..5154cfffc414e1f6039e55f1a256bbaacb56bc55 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
|
||
|
|
@@ -470,6 +470,11 @@ public class CraftBlock implements Block {
|
||
|
|
public boolean isSolid() {
|
||
|
|
return getNMS().getMaterial().blocksMotion();
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ @Override
|
||
|
|
+ public boolean isCollidable() {
|
||
|
|
+ return getNMS().getBlock().hasCollision;
|
||
|
|
+ }
|
||
|
|
// Paper end
|
||
|
|
|
||
|
|
@Override
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
|
||
|
|
index 7b9e943b391c061782fccd2b8d705ceec8db50fe..966ac60daebb7bb211ab8096fc0c5f33db67320a 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
|
||
|
|
@@ -324,4 +324,11 @@ public class CraftBlockState implements BlockState {
|
||
|
|
throw new IllegalStateException("The blockState must be placed to call this method");
|
||
|
|
}
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ // Paper start
|
||
|
|
+ @Override
|
||
|
|
+ public boolean isCollidable() {
|
||
|
|
+ return this.data.getBlock().hasCollision;
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
}
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
||
|
|
index dcaa189c17dd928d7a19e820ec2ff521e7243b7a..c6bd1c1f973157c1d8a56e8297729cb896785dd6 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
||
|
|
@@ -521,6 +521,12 @@ public final class CraftMagicNumbers implements UnsafeValues {
|
||
|
|
var supplier = net.minecraft.world.entity.ai.attributes.DefaultAttributes.getSupplier((net.minecraft.world.entity.EntityType<? extends net.minecraft.world.entity.LivingEntity>) net.minecraft.core.Registry.ENTITY_TYPE.get(CraftNamespacedKey.toMinecraft(bukkitEntityKey)));
|
||
|
|
return new io.papermc.paper.attribute.UnmodifiableAttributeMap(supplier);
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ @Override
|
||
|
|
+ public boolean isCollidable(Material material) {
|
||
|
|
+ Preconditions.checkArgument(material.isBlock(), material + " is not a block");
|
||
|
|
+ return getBlock(material).hasCollision;
|
||
|
|
+ }
|
||
|
|
// Paper end
|
||
|
|
|
||
|
|
/**
|