Upstream merge

By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
Spigot
2014-06-02 15:38:03 +01:00
parent 717840f3ee
commit 226c6d1ef0
8 changed files with 17 additions and 87 deletions

View File

@@ -1,14 +1,14 @@
From de4027c312d39d2ab4824c5de2c0f43a79ce091d Mon Sep 17 00:00:00 2001
From 5048ab570df46e50d433d0de6d88c1cc29977ed6 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 5138eec..3a18002 100644
index f32f40d..d1bbb05 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -224,7 +224,13 @@ public final class ItemStack {
@@ -228,7 +228,13 @@ public final class ItemStack {
}
public boolean g() {