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

Finish up the patches for 1.5. Now to test.

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-03-16 09:08:53 +11:00
parent 12afb9956e
commit 8cd6af53fe
7 changed files with 79 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,16 +1,25 @@
From 8503226f492fd2dfcff2fd1cbc9b737c71c05fd0 Mon Sep 17 00:00:00 2001
From cc1b0248bbf67e99b0862ae7ebbdd1415a288d04 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
---
src/main/java/net/minecraft/server/ItemStack.java | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
src/main/java/net/minecraft/server/ItemStack.java | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index cd6dd07..a2df1d5 100644
index cd6dd07..b8c845e 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -159,7 +159,7 @@ public final class ItemStack {
return Item.byId[this.id].getMaxDurability();
}
- public boolean isDamaged(int i, Random random) {
+ public boolean isDamaged(int i, Random random, EntityLiving entityliving) {
if (!this.g()) {
return false;
} else {
@@ -174,7 +174,16 @@ public final class ItemStack {
}
@@ -21,7 +30,7 @@ index cd6dd07..a2df1d5 100644
+ org.bukkit.craftbukkit.inventory.CraftItemStack item = org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(this);
+ org.bukkit.event.player.PlayerItemDamageEvent event = new org.bukkit.event.player.PlayerItemDamageEvent((org.bukkit.entity.Player) entityliving.getBukkitEntity(), item, i);
+ org.bukkit.Bukkit.getServer().getPluginManager().callEvent(event);
+ if (event.isCancelled()) return;
+ if (event.isCancelled()) return false;
+ i = event.getDamage();
+ }
+ // Spigot end
@@ -29,6 +38,15 @@ index cd6dd07..a2df1d5 100644
return false;
}
}
@@ -187,7 +196,7 @@ public final class ItemStack {
public void damage(int i, EntityLiving entityliving) {
if (!(entityliving instanceof EntityHuman) || !((EntityHuman) entityliving).abilities.canInstantlyBuild) {
if (this.g()) {
- if (this.isDamaged(i, entityliving.aE())) {
+ if (this.isDamaged(i, entityliving.aE(), entityliving)) {
entityliving.a(this);
if (entityliving instanceof EntityHuman) {
((EntityHuman) entityliving).a(StatisticList.F[this.id], 1);
--
1.8.1-rc2