Update SpigotMC's patches

5a0150f586ed3eb15fe6f1f596d1a5a7d806f0f9 Fix ITEM_BREAK
e6a3911057bd94d8bd7021cbb4923fb84fb106d1 Upstream merge
d1cdcf8d4c3639f956474f02ed662517cffbe23e Remove old patch
068df64aeee368377e1673667bffc7a6dcf90554 Rebuild all patches
This commit is contained in:
Zach Brown
2014-11-30 16:16:48 -06:00
parent af814004a5
commit 19972e09b8
191 changed files with 409 additions and 421 deletions

View File

@@ -1,19 +1,20 @@
From 2ab992704cc79f958e0f794be42191c004ecbed9 Mon Sep 17 00:00:00 2001
From cad4a665ef46edecb4d0f6769c06e8317fb683de Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Fri, 20 Dec 2013 21:36:06 +0000
Subject: [PATCH] Particle API
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftEffect.java b/src/main/java/org/bukkit/craftbukkit/CraftEffect.java
index 7de0de5..7eca388 100644
index 7de0de5..13f9e9d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftEffect.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftEffect.java
@@ -55,6 +55,8 @@ public class CraftEffect {
@@ -55,6 +55,9 @@ public class CraftEffect {
Validate.isTrue(((Material) data).isBlock(), "Material is not a block!");
datavalue = ((Material) data).getId();
break;
+ case ITEM_BREAK:
+ datavalue = ((Material) data).getId();
+ break;
default:
datavalue = 0;
}
@@ -131,7 +132,7 @@ index 13f85d5..e395704 100644
public Spigot spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 37b8287..fb1347e 100644
index edac4c7..8cc56d2 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1342,6 +1342,63 @@ public class CraftPlayer extends CraftHumanEntity implements Player {