Remove/Adjust diff that was changed based on this assumption

PaperMC · Dec 26, 2024 · 59f43ad · 59f43ad
1 parent 6cc87f8
commit 59f43ad
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 23 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
@@ -1,13 +1,5 @@
 --- a/net/minecraft/server/commands/GiveCommand.java
 +++ b/net/minecraft/server/commands/GiveCommand.java
-@@ -51,6 +_,7 @@
-
-     private static int giveItem(CommandSourceStack source, ItemInput item, Collection<ServerPlayer> 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) {
 @@ -66,7 +_,7 @@
                      ItemStack itemStack1 = item.createItemStack(min, false);
                      boolean flag = serverPlayer.getInventory().add(itemStack1);
@@ -17,17 +9,3 @@
                          if (itemEntity != null) {
                              itemEntity.makeFakeItem();
                          }
-@@ -95,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();
diff --git a/paper-server/patches/sources/net/minecraft/server/level/ServerPlayer.java.patch b/paper-server/patches/sources/net/minecraft/server/level/ServerPlayer.java.patch
@@ -1382,7 +1382,7 @@
              if (traceItem) {
                  if (!item.isEmpty()) {
 -                    this.awardStat(Stats.ITEM_DROPPED.get(item.getItem()), droppedItem.getCount());
-+                    this.awardStat(Stats.ITEM_DROPPED.get(item.getItem()), item.getCount()); // Paper - Fix PlayerDropItemEvent using wrong item
++                    this.awardStat(Stats.ITEM_DROPPED.get(item.getItem()), item.getCount()); // Paper - Use updated count on item provided from event
                  }
 
                  this.awardStat(Stats.DROP);