So it begins...
This commit is contained in:
		
					parent
					
						
							
								efc1f99846
							
						
					
				
			
			
				commit
				
					
						524eeedaa8
					
				
			
		
					 1048 changed files with 66 additions and 59 deletions
				
			
		
							
								
								
									
										46
									
								
								patches/unapplied/server/Add-getDrops-to-BlockState.patch
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										46
									
								
								patches/unapplied/server/Add-getDrops-to-BlockState.patch
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,46 @@
 | 
			
		|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 | 
			
		||||
From: MelnCat <melncatuwu@gmail.com>
 | 
			
		||||
Date: Fri, 12 Aug 2022 23:24:37 -0700
 | 
			
		||||
Subject: [PATCH] Add getDrops to BlockState
 | 
			
		||||
 | 
			
		||||
Originally added isPreferredTool to BlockData but
 | 
			
		||||
upstream added that.
 | 
			
		||||
 | 
			
		||||
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
 | 
			
		||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 | 
			
		||||
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
 | 
			
		||||
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
 | 
			
		||||
@@ -0,0 +0,0 @@ public class CraftBlockState implements BlockState {
 | 
			
		||||
     public boolean isCollidable() {
 | 
			
		||||
         return this.data.getBlock().hasCollision;
 | 
			
		||||
     }
 | 
			
		||||
+
 | 
			
		||||
+    @Override
 | 
			
		||||
+    public java.util.Collection<org.bukkit.inventory.ItemStack> getDrops() {
 | 
			
		||||
+        return this.getDrops(null);
 | 
			
		||||
+    }
 | 
			
		||||
+
 | 
			
		||||
+    @Override
 | 
			
		||||
+    public java.util.Collection<org.bukkit.inventory.ItemStack> getDrops(org.bukkit.inventory.ItemStack item) {
 | 
			
		||||
+        return this.getDrops(item, null);
 | 
			
		||||
+    }
 | 
			
		||||
+
 | 
			
		||||
+    @Override
 | 
			
		||||
+    public java.util.Collection<org.bukkit.inventory.ItemStack> getDrops(org.bukkit.inventory.ItemStack item, org.bukkit.entity.Entity entity) {
 | 
			
		||||
+        net.minecraft.world.item.ItemStack nms = org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(item);
 | 
			
		||||
+
 | 
			
		||||
+        // Modelled off EntityHuman#hasBlock
 | 
			
		||||
+        if (item == null || !data.requiresCorrectToolForDrops() || nms.isCorrectToolForDrops(data)) {
 | 
			
		||||
+            return net.minecraft.world.level.block.Block.getDrops(
 | 
			
		||||
+                data,
 | 
			
		||||
+                world.getHandle(),
 | 
			
		||||
+                position,
 | 
			
		||||
+                world.getHandle().getBlockEntity(position), entity == null ? null :
 | 
			
		||||
+                    ((org.bukkit.craftbukkit.entity.CraftEntity) entity).getHandle(), nms
 | 
			
		||||
+            ).stream().map(org.bukkit.craftbukkit.inventory.CraftItemStack::asBukkitCopy).toList();
 | 
			
		||||
+        } else {
 | 
			
		||||
+            return java.util.Collections.emptyList();
 | 
			
		||||
+        }
 | 
			
		||||
+    }
 | 
			
		||||
     // Paper end
 | 
			
		||||
 }
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue