diff options
Diffstat (limited to 'patch-remap/og/net/minecraft/server/commands/CommandLoot.patch')
| -rw-r--r-- | patch-remap/og/net/minecraft/server/commands/CommandLoot.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/patch-remap/og/net/minecraft/server/commands/CommandLoot.patch b/patch-remap/og/net/minecraft/server/commands/CommandLoot.patch new file mode 100644 index 0000000000..5004695bcc --- /dev/null +++ b/patch-remap/og/net/minecraft/server/commands/CommandLoot.patch @@ -0,0 +1,19 @@ +--- a/net/minecraft/server/commands/CommandLoot.java ++++ b/net/minecraft/server/commands/CommandLoot.java +@@ -90,7 +90,7 @@ + } + + private static <T extends ArgumentBuilder<CommandListenerWrapper, T>> T addTargets(T t0, CommandLoot.c commandloot_c) { +- return t0.then(((LiteralArgumentBuilder) net.minecraft.commands.CommandDispatcher.literal("replace").then(net.minecraft.commands.CommandDispatcher.literal("entity").then(net.minecraft.commands.CommandDispatcher.argument("entities", ArgumentEntity.entities()).then(commandloot_c.construct(net.minecraft.commands.CommandDispatcher.argument("slot", ArgumentInventorySlot.slot()), (commandcontext, list, commandloot_a) -> { ++ return (T) t0.then(((LiteralArgumentBuilder) net.minecraft.commands.CommandDispatcher.literal("replace").then(net.minecraft.commands.CommandDispatcher.literal("entity").then(net.minecraft.commands.CommandDispatcher.argument("entities", ArgumentEntity.entities()).then(commandloot_c.construct(net.minecraft.commands.CommandDispatcher.argument("slot", ArgumentInventorySlot.slot()), (commandcontext, list, commandloot_a) -> { // CraftBukkit - decompile error + return entityReplace(ArgumentEntity.getEntities(commandcontext, "entities"), ArgumentInventorySlot.getSlot(commandcontext, "slot"), list.size(), list, commandloot_a); + }).then(commandloot_c.construct(net.minecraft.commands.CommandDispatcher.argument("count", IntegerArgumentType.integer(0)), (commandcontext, list, commandloot_a) -> { + return entityReplace(ArgumentEntity.getEntities(commandcontext, "entities"), ArgumentInventorySlot.getSlot(commandcontext, "slot"), IntegerArgumentType.getInteger(commandcontext, "count"), list, commandloot_a); +@@ -247,6 +247,7 @@ + private static int dropInWorld(CommandListenerWrapper commandlistenerwrapper, Vec3D vec3d, List<ItemStack> list, CommandLoot.a commandloot_a) throws CommandSyntaxException { + WorldServer worldserver = commandlistenerwrapper.getLevel(); + ++ list.removeIf(ItemStack::isEmpty); // CraftBukkit - SPIGOT-6959 Remove empty items for avoid throw an error in new EntityItem + list.forEach((itemstack) -> { + EntityItem entityitem = new EntityItem(worldserver, vec3d.x, vec3d.y, vec3d.z, itemstack.copy()); + |