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

Update le patches so that they may henceforth apply cleanly without errors due to the last upstream commit.

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-03-19 16:51:45 +11:00
parent 96d7ce81a7
commit bad273fe08
10 changed files with 58 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From a1452c17df604ca2f6e605ceb354fe1bcc1ecfc1 Mon Sep 17 00:00:00 2001
From 64d764df1534b32be328af8a409620fe18575522 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
@@ -8,10 +8,10 @@ Subject: [PATCH] PlayerItemDamageEvent
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index 3b3a48d..f483725 100644
index 389558c..70d9160 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -170,7 +170,13 @@ public final class ItemStack {
@@ -176,7 +176,13 @@ public final class ItemStack {
return Item.byId[this.id].getMaxDurability();
}
@@ -25,7 +25,7 @@ index 3b3a48d..f483725 100644
if (!this.g()) {
return false;
} else {
@@ -185,7 +191,16 @@ public final class ItemStack {
@@ -191,7 +197,16 @@ public final class ItemStack {
}
i -= k;
@@ -43,7 +43,7 @@ index 3b3a48d..f483725 100644
return false;
}
}
@@ -198,7 +213,7 @@ public final class ItemStack {
@@ -204,7 +219,7 @@ public final class ItemStack {
public void damage(int i, EntityLiving entityliving) {
if (!(entityliving instanceof EntityHuman) || !((EntityHuman) entityliving).abilities.canInstantlyBuild) {
if (this.g()) {