From a712e4f6064440c33defbee4bbe7a7cc155a5d21 Mon Sep 17 00:00:00 2001 From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com> Date: Sun, 29 Jun 2025 22:09:29 -0400 Subject: [PATCH] rebase --- .../server/commands/GiveCommand.java.patch | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/paper-server/patches/sources/net/minecraft/server/commands/GiveCommand.java.patch b/paper-server/patches/sources/net/minecraft/server/commands/GiveCommand.java.patch index 7b45085021..61b5053cd9 100644 --- a/paper-server/patches/sources/net/minecraft/server/commands/GiveCommand.java.patch +++ b/paper-server/patches/sources/net/minecraft/server/commands/GiveCommand.java.patch @@ -1,13 +1,5 @@ --- a/net/minecraft/server/commands/GiveCommand.java +++ b/net/minecraft/server/commands/GiveCommand.java -@@ -54,6 +_,7 @@ - - private static int giveItem(CommandSourceStack source, ItemInput item, Collection targets, int count) throws CommandSyntaxException { - ItemStack itemStack = item.createItemStack(1, false); -+ final Component displayName = itemStack.getDisplayName(); // Paper - get display name early - int maxStackSize = itemStack.getMaxStackSize(); - int i = maxStackSize * 100; - if (count > i) { @@ -69,7 +_,7 @@ ItemStack itemStack1 = item.createItemStack(min, false); boolean flag = serverPlayer.getInventory().add(itemStack1); @@ -26,17 +18,3 @@ if (itemEntity != null) { itemEntity.setNoPickUpDelay(); itemEntity.setTarget(serverPlayer.getUUID()); -@@ -98,11 +_,11 @@ - - if (targets.size() == 1) { - source.sendSuccess( -- () -> Component.translatable("commands.give.success.single", count, itemStack.getDisplayName(), targets.iterator().next().getDisplayName()), -+ () -> Component.translatable("commands.give.success.single", count, displayName, targets.iterator().next().getDisplayName()), // Paper - use cached display name - true - ); - } else { -- source.sendSuccess(() -> Component.translatable("commands.give.success.single", count, itemStack.getDisplayName(), targets.size()), true); -+ source.sendSuccess(() -> Component.translatable("commands.give.success.single", count, displayName, targets.size()), true); // Paper - use cached display name - } - - return targets.size();