From 6c93b3cc484092563bc980a7cff827391d70b8fc Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 2 Jul 2013 13:17:13 +1000 Subject: [PATCH] Update particle api mc-dev staged things --- CraftBukkit-Patches/0002-mc-dev-imports.patch | 8 ++++---- CraftBukkit-Patches/0042-Particle-API.patch | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CraftBukkit-Patches/0002-mc-dev-imports.patch b/CraftBukkit-Patches/0002-mc-dev-imports.patch index beaae1b1e9..fefd105537 100644 --- a/CraftBukkit-Patches/0002-mc-dev-imports.patch +++ b/CraftBukkit-Patches/0002-mc-dev-imports.patch @@ -1,4 +1,4 @@ -From e3f0ba44ba4ca8cc3efb38676f6da12252f1833a Mon Sep 17 00:00:00 2001 +From d1aafbeed41761872184e2f9d161b1faecd818f0 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 2 Jul 2013 13:13:29 +1000 Subject: [PATCH] mc-dev imports @@ -319,7 +319,7 @@ index 0000000..53c1cb5 +} diff --git a/src/main/java/net/minecraft/server/Packet63WorldParticles.java b/src/main/java/net/minecraft/server/Packet63WorldParticles.java new file mode 100644 -index 0000000..d7f4d2a +index 0000000..f036c53 --- /dev/null +++ b/src/main/java/net/minecraft/server/Packet63WorldParticles.java @@ -0,0 +1,51 @@ @@ -342,7 +342,7 @@ index 0000000..d7f4d2a + + public Packet63WorldParticles() {} + -+ public void a(DataInput datainput) { ++ public void a(DataInput datainput) throws java.io.IOException { // Spigot - throws + this.a = a(datainput, 64); + this.b = datainput.readFloat(); + this.c = datainput.readFloat(); @@ -354,7 +354,7 @@ index 0000000..d7f4d2a + this.i = datainput.readInt(); + } + -+ public void a(DataOutput dataoutput) { ++ public void a(DataOutput dataoutput) throws java.io.IOException { // Spigot - throws + a(this.a, dataoutput); + dataoutput.writeFloat(this.b); + dataoutput.writeFloat(this.c); diff --git a/CraftBukkit-Patches/0042-Particle-API.patch b/CraftBukkit-Patches/0042-Particle-API.patch index ec3d2f7d72..2e570b0894 100644 --- a/CraftBukkit-Patches/0042-Particle-API.patch +++ b/CraftBukkit-Patches/0042-Particle-API.patch @@ -1,11 +1,11 @@ -From 8aba10490a88039920072d9fec1e77823d33d54e Mon Sep 17 00:00:00 2001 +From 2eaef37fd28706240bfcff35f4e596997ac12e03 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 16:14:30 +1000 Subject: [PATCH] Particle API diff --git a/src/main/java/net/minecraft/server/Packet63WorldParticles.java b/src/main/java/net/minecraft/server/Packet63WorldParticles.java -index d7f4d2a..5e051eb 100644 +index f036c53..60e1237 100644 --- a/src/main/java/net/minecraft/server/Packet63WorldParticles.java +++ b/src/main/java/net/minecraft/server/Packet63WorldParticles.java @@ -17,6 +17,20 @@ public class Packet63WorldParticles extends Packet { @@ -26,7 +26,7 @@ index d7f4d2a..5e051eb 100644 + } + // Spigot end + - public void a(DataInput datainput) { + public void a(DataInput datainput) throws java.io.IOException { // Spigot - throws this.a = a(datainput, 64); this.b = datainput.readFloat(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftEffect.java b/src/main/java/org/bukkit/craftbukkit/CraftEffect.java