From a8a4bedd2a9ef3c192ecf76db9afaf0b784ed08d Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Thu, 9 Jun 2016 11:43:49 +1000
Subject: Update to Minecraft 1.10

---
 nms-patches/ItemStack.patch | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'nms-patches/ItemStack.patch')

diff --git a/nms-patches/ItemStack.patch b/nms-patches/ItemStack.patch
index 26e1bdd7..4101e906 100644
--- a/nms-patches/ItemStack.patch
+++ b/nms-patches/ItemStack.patch
@@ -20,8 +20,8 @@
  public final class ItemStack {
  
      public static final DecimalFormat a = new DecimalFormat("#.##");
-@@ -47,10 +60,20 @@
-         this.k = false;
+@@ -43,10 +56,20 @@
+     public ItemStack(Item item, int i, int j) {
          this.item = item;
          this.count = i;
 -        this.damage = j;
@@ -44,7 +44,7 @@
  
      }
  
-@@ -85,11 +108,131 @@
+@@ -81,11 +104,131 @@
      }
  
      public EnumInteractionResult placeItem(EntityHuman entityhuman, World world, BlockPosition blockposition, EnumHand enumhand, EnumDirection enumdirection, float f, float f1, float f2) {
@@ -177,7 +177,7 @@
  
          return enuminteractionresult;
      }
-@@ -114,7 +257,7 @@
+@@ -110,7 +253,7 @@
          nbttagcompound.setByte("Count", (byte) this.count);
          nbttagcompound.setShort("Damage", (short) this.damage);
          if (this.tag != null) {
@@ -186,7 +186,7 @@
          }
  
          return nbttagcompound;
-@@ -123,13 +266,18 @@
+@@ -119,13 +262,18 @@
      public void c(NBTTagCompound nbttagcompound) {
          this.item = Item.d(nbttagcompound.getString("id"));
          this.count = nbttagcompound.getByte("Count");
@@ -206,7 +206,7 @@
              if (this.item != null) {
                  this.item.a(this.tag);
              }
-@@ -166,11 +314,30 @@
+@@ -162,11 +310,30 @@
      }
  
      public void setData(int i) {
@@ -239,7 +239,7 @@
      }
  
      public int j() {
-@@ -218,6 +385,12 @@
+@@ -214,6 +381,12 @@
                          this.count = 0;
                      }
  
@@ -252,7 +252,7 @@
                      this.damage = 0;
                  }
  
-@@ -518,6 +691,7 @@
+@@ -514,6 +687,7 @@
      @Deprecated
      public void setItem(Item item) {
          this.item = item;
-- 
cgit v1.2.3