Update to 1.8.4

2015-05-09 21:23:26 +01:00
parent a5b3760b6d
commit 80d0e8ffa7
156 changed files with 121 additions and 380 deletions
--- a/CraftBukkit-Patches/0016-PlayerItemDamageEvent.patch
+++ b/CraftBukkit-Patches/0016-PlayerItemDamageEvent.patch
@@ -0,0 +1,50 @@
+From 0000000000000000000000000000000000000000 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
+@@ -0,0 +0,0 @@ public final class ItemStack {
+     }
+ 
+     public boolean isDamaged(int i, Random random) {
+        return isDamaged(i, random, null);
+    }
+
+    public boolean isDamaged(int i, Random random, EntityLiving entityliving) {
+        // Spigot end
+         if (!this.e()) {
+             return false;
+         } else {
+@@ -0,0 +0,0 @@ public final class ItemStack {
+                 }
+ 
+                 i -= k;
+-                if (i <= 0) {
+                // Spigot start
+                if (entityliving instanceof EntityPlayer) {
+                    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 false;
+                    i = event.getDamage();
+                }
+                // Spigot end
+                if (i <= 0 ) {
+                     return false;
+                 }
+             }
+@@ -0,0 +0,0 @@ public final class ItemStack {
+     public void damage(int i, EntityLiving entityliving) {
+         if (!(entityliving instanceof EntityHuman) || !((EntityHuman) entityliving).abilities.canInstantlyBuild) {
+             if (this.e()) {
+-                if (this.isDamaged(i, entityliving.bc())) {
+                if (this.isDamaged(i, entityliving.bc(), entityliving)) { // Spigot
+                     entityliving.b(this);
+                     --this.count;
+                     if (entityliving instanceof EntityHuman) {
+--