blob: 1ab5f0f7ace80b35dada1ae9ed393050e5d07466 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
|
--- a/net/minecraft/server/commands/LootCommand.java
+++ b/net/minecraft/server/commands/LootCommand.java
@@ -392,11 +245,14 @@
}
private static int dropInWorld(CommandSourceStack source, Vec3 pos, List<ItemStack> items, LootCommand.Callback callback) throws CommandSyntaxException {
- ServerLevel level = source.getLevel();
- items.forEach(itemStack -> {
- ItemEntity itemEntity = new ItemEntity(level, pos.x, pos.y, pos.z, itemStack.copy());
- itemEntity.setDefaultPickUpDelay();
- level.addFreshEntity(itemEntity);
+ ServerLevel worldserver = source.getLevel();
+
+ items.removeIf(ItemStack::isEmpty); // CraftBukkit - SPIGOT-6959 Remove empty items for avoid throw an error in new EntityItem
+ items.forEach((itemstack) -> {
+ ItemEntity entityitem = new ItemEntity(worldserver, pos.x, pos.y, pos.z, itemstack.copy());
+
+ entityitem.setDefaultPickUpDelay();
+ worldserver.addFreshEntity(entityitem);
});
callback.accept(items);
return items.size();
|