More patch fixing
This commit is contained in:
@@ -1,38 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Cryptite <cryptite@gmail.com>
|
||||
Date: Mon, 10 Apr 2023 07:31:54 -0500
|
||||
Subject: [PATCH] Add provided Material to getDrops
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
|
||||
index 7cdd76f87a10529df5b9476bd2728eb8db9448b1..88ac6604decf8711ffba07bec4851ba6b75084b3 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
|
||||
@@ -591,7 +591,18 @@ public class CraftBlock implements Block {
|
||||
|
||||
@Override
|
||||
public Collection<ItemStack> getDrops(ItemStack item, Entity entity) {
|
||||
- net.minecraft.world.level.block.state.BlockState iblockdata = this.getNMS();
|
||||
+ return getDrops(null, item, entity); // Slice start
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public Collection<ItemStack> getDrops(Material blockType, ItemStack item, Entity entity) {
|
||||
+ net.minecraft.world.level.block.state.BlockState iblockdata;
|
||||
+ if (blockType == null) {
|
||||
+ iblockdata = this.getNMS();
|
||||
+ } else {
|
||||
+ iblockdata = ((CraftBlockData) blockType.createBlockData()).getState();
|
||||
+ }
|
||||
+
|
||||
net.minecraft.world.item.ItemStack nms = CraftItemStack.asNMSCopy(item);
|
||||
|
||||
// Modelled off EntityHuman#hasBlock
|
||||
@@ -602,6 +613,7 @@ public class CraftBlock implements Block {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
}
|
||||
+ // Slice end
|
||||
|
||||
@Override
|
||||
public boolean isPreferredTool(ItemStack item) {
|
||||
Reference in New Issue
Block a user