SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upstream merge

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-04-24 16:27:12 +10:00
parent a8030addd9
commit b56d35552d
78 changed files with 483 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CraftBukkit-Patches/0019-PlayerItemDamageEvent.patch
View File

@@ -1,14 +1,14 @@
From e215ab2e0adac57fc67baa5b4b4fbce4ceb1591b Mon Sep 17 00:00:00 2001
From 05af846b96eabf3961284ab159e1f1dcd88ae1da Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 4 Mar 2013 18:45:52 +1100
Subject: [PATCH] PlayerItemDamageEvent
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index 791467b..cc18816 100644
index bae352b..52ff8e6 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -176,7 +176,13 @@ public final class ItemStack {
@@ -259,7 +259,13 @@ public final class ItemStack {
return this.item.getMaxDurability();
}
@@ -22,7 +22,7 @@ index 791467b..cc18816 100644
if (!this.g()) {
return false;
} else {
@@ -191,7 +197,16 @@ public final class ItemStack {
@@ -274,7 +280,16 @@ public final class ItemStack {
}
i -= k;
@@ -40,7 +40,7 @@ index 791467b..cc18816 100644
return false;
}
}
@@ -204,7 +219,7 @@ public final class ItemStack {
@@ -287,7 +302,7 @@ public final class ItemStack {
public void damage(int i, EntityLiving entityliving) {
if (!(entityliving instanceof EntityHuman) || !((EntityHuman) entityliving).abilities.canInstantlyBuild) {
if (this.g()) {