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

Merge in some stuff

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2013-12-14 17:58:22 +11:00
parent 098db09224
commit 5cd48cf621
14 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,14 +1,14 @@
From daed468c7916d5bf90cc56e5c16558ec5492db97 Mon Sep 17 00:00:00 2001
From 798537c091b6cf69a3d872445d1ec08327214179 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 53c665b..123e4a5 100644
index b308e03..f32322e 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -175,7 +175,13 @@ public final class ItemStack {
@@ -176,7 +176,13 @@ public final class ItemStack {
return this.item.getMaxDurability();
}
@@ -22,7 +22,7 @@ index 53c665b..123e4a5 100644
if (!this.g()) {
return false;
} else {
@@ -190,7 +196,16 @@ public final class ItemStack {
@@ -191,7 +197,16 @@ public final class ItemStack {
}
i -= k;
@@ -40,7 +40,7 @@ index 53c665b..123e4a5 100644
return false;
}
}
@@ -203,7 +218,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()) {