mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-12 18:55:51 -07:00
Update to Minecraft 1.13-pre7
This commit is contained in:
@@ -1,9 +1,9 @@
|
||||
--- a/net/minecraft/server/InventoryMerchant.java
|
||||
+++ b/net/minecraft/server/InventoryMerchant.java
|
||||
@@ -1,6 +1,13 @@
|
||||
package net.minecraft.server;
|
||||
@@ -2,6 +2,13 @@
|
||||
|
||||
import java.util.Iterator;
|
||||
import javax.annotation.Nullable;
|
||||
+// CraftBukkit start
|
||||
+import java.util.List;
|
||||
+import org.bukkit.Location;
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
public class InventoryMerchant implements IInventory {
|
||||
|
||||
@@ -10,6 +17,40 @@
|
||||
@@ -11,6 +18,40 @@
|
||||
private MerchantRecipe recipe;
|
||||
public int selectedIndex;
|
||||
|
||||
@@ -55,7 +55,7 @@
|
||||
public InventoryMerchant(EntityHuman entityhuman, IMerchant imerchant) {
|
||||
this.itemsInSlots = NonNullList.a(3, ItemStack.a);
|
||||
this.player = entityhuman;
|
||||
@@ -89,7 +130,7 @@
|
||||
@@ -91,7 +132,7 @@
|
||||
}
|
||||
|
||||
public int getMaxStackSize() {
|
||||
|
Reference in New Issue
Block a user