Upstream merge

By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-05-27 17:40:02 +10:00
parent 955a0fb081
commit 23c4e709bc
10 changed files with 65 additions and 34 deletions

View File

@@ -1,14 +1,14 @@
From 111a7bac3315b2f8a751faf88a471a41684aa833 Mon Sep 17 00:00:00 2001
From de4027c312d39d2ab4824c5de2c0f43a79ce091d Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 10 Jan 2014 15:15:50 +1100
Subject: [PATCH] Fix ItemStack Unbreakable Code
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index 52ff8e6..a0050ba 100644
index 5138eec..3a18002 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -213,7 +213,13 @@ public final class ItemStack {
@@ -224,7 +224,13 @@ public final class ItemStack {
}
public boolean g() {