mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-12 06:58:11 +02:00
899bc53b79
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: f47abd88 SPIGOT-6242: Fix some file line endings de96535b SPIGOT-6234: enum classes don't serialize properly when implementing ConfigurationSerializable CraftBukkit Changes: 4475707d SPIGOT-6244: /spawnpoint ignores angle 8b3b096d SPIGOT-6242: Fix some file line endings 4b33c749 SPIGOT-6186: Canceling a CreatureSpawnEvent results in a "Unable to summon entity due to duplicate UUIDs" error 2b3ca726 SPIGOT-6236: Vehicle passenger portal cooldown does not change
25 lines
1.1 KiB
Diff
25 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: chickeneer <emcchickeneer@gmail.com>
|
|
Date: Wed, 18 Mar 2020 00:07:46 -0500
|
|
Subject: [PATCH] MC-147729: Drop items that are extra from a crafting recipe
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/AutoRecipe.java b/src/main/java/net/minecraft/server/AutoRecipe.java
|
|
index a5d29242b48e0d19d35ee2fe84824a2ef32923b9..156ab966e8fb4d742b50a2f90420710b0c7b4764 100644
|
|
--- a/src/main/java/net/minecraft/server/AutoRecipe.java
|
|
+++ b/src/main/java/net/minecraft/server/AutoRecipe.java
|
|
@@ -60,7 +60,12 @@ public class AutoRecipe<C extends IInventory> implements AutoRecipeAbstract<Inte
|
|
if (j == -1) {
|
|
j = this.c.getFirstEmptySlotIndex();
|
|
}
|
|
-
|
|
+ // Paper start
|
|
+ if (j == -1) {
|
|
+ this.c.player.drop(itemstack.cloneItemStack(), false);
|
|
+ break;
|
|
+ }
|
|
+ // Paper end
|
|
ItemStack itemstack1 = itemstack.cloneItemStack();
|
|
|
|
itemstack1.setCount(1);
|