fixup diffs

Author: kennytv

paper-server/patches/sources/net/minecraft/server/commands/GiveCommand.java.patch

@@ -8,15 +8,6 @@
          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);
-                     if (flag && itemStack1.isEmpty()) {
--                        ItemEntity itemEntity = serverPlayer.drop(itemStack, false);
-+                        ItemEntity itemEntity = serverPlayer.drop(itemStack, false, false);
-                         if (itemEntity != null) {
-                             itemEntity.makeFakeItem();
-                         }
 @@ -95,11 +_,11 @@
 
              if (targets.size() == 1) {

paper-server/patches/sources/net/minecraft/world/inventory/HorseInventoryMenu.java.patch

@@ -1,11 +1,9 @@
 --- a/net/minecraft/world/inventory/HorseInventoryMenu.java
 +++ b/net/minecraft/world/inventory/HorseInventoryMenu.java
-@@ -18,10 +_,24 @@
-     private final AbstractHorse horse;
+@@ -19,9 +_,23 @@
      public static final int SLOT_SADDLE = 0;
      public static final int SLOT_BODY_ARMOR = 1;
--    public static final int SLOT_HORSE_INVENTORY_START = 2;
-+    private static final int SLOT_HORSE_INVENTORY_START = 2;
+     public static final int SLOT_HORSE_INVENTORY_START = 2;
 +    // CraftBukkit start
 +    org.bukkit.craftbukkit.inventory.CraftInventoryView bukkitEntity;
 +    Inventory player;