Update to Minecraft 1.14-pre5

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-04-23 12:00:00 +10:00
parent 0e98365784
commit a0f2b74c8d
560 changed files with 10642 additions and 10867 deletions

View File

@@ -1,9 +1,9 @@
--- a/net/minecraft/server/InventoryCrafting.java
+++ b/net/minecraft/server/InventoryCrafting.java
@@ -2,6 +2,14 @@
@@ -1,6 +1,14 @@
package net.minecraft.server;
import java.util.Iterator;
import javax.annotation.Nullable;
+// CraftBukkit start
+import java.util.List;
+import org.bukkit.Location;
@@ -15,7 +15,7 @@
public class InventoryCrafting implements IInventory, AutoRecipeOutput {
@@ -10,6 +18,63 @@
@@ -9,6 +17,68 @@
private final int c;
public final Container container;
@@ -50,6 +50,11 @@
+ return (owner == null) ? null : owner.getBukkitEntity();
+ }
+
+ @Override
+ public int getMaxStackSize() {
+ return maxStack;
+ }
+
+ public void setMaxStackSize(int size) {
+ maxStack = size;
+ resultInventory.setMaxStackSize(size);