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

Upstream merge

Browse Source 
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
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 9bc96791db6467b0721810dba820374aa6c46065 Mon Sep 17 00:00:00 2001
From 6d1e63d8c59ecc36efdbd54880bb0ca1af9bda2c 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 7342848..5138eec 100644
index f9aaf4a..f32f40d 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -270,7 +270,13 @@ public final class ItemStack {
@@ -279,7 +279,13 @@ public final class ItemStack {
return this.item.getMaxDurability();
}
@@ -22,7 +22,7 @@ index 7342848..5138eec 100644
if (!this.g()) {
return false;
} else {
@@ -285,7 +291,16 @@ public final class ItemStack {
@@ -294,7 +300,16 @@ public final class ItemStack {
}
i -= k;
@@ -40,7 +40,7 @@ index 7342848..5138eec 100644
return false;
}
}
@@ -298,7 +313,7 @@ public final class ItemStack {
@@ -307,7 +322,7 @@ public final class ItemStack {
public void damage(int i, EntityLiving entityliving) {
if (!(entityliving instanceof EntityHuman) || !((EntityHuman) entityliving).abilities.canInstantlyBuild) {
if (this.g()) {