From 09ec323cc36be54afe80e8572691458bb5b46f78 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 8 Jun 2013 09:50:30 +1000 Subject: [PATCH] Shuffle location of this small mc-dev change --- CraftBukkit-Patches/0002-mc-dev-imports.patch | 8 ++++---- CraftBukkit-Patches/0048-Particle-API.patch | 19 ++++--------------- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/CraftBukkit-Patches/0002-mc-dev-imports.patch b/CraftBukkit-Patches/0002-mc-dev-imports.patch index b1cd24a894..178b6fb8b6 100644 --- a/CraftBukkit-Patches/0002-mc-dev-imports.patch +++ b/CraftBukkit-Patches/0002-mc-dev-imports.patch @@ -1,4 +1,4 @@ -From ab1f4060dfec54383427f22f29da6ea2c0ae49c9 Mon Sep 17 00:00:00 2001 +From ab45b805b8da43f857f2987a41846aaad481273e Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 10 Apr 2013 13:52:52 +1000 Subject: [PATCH] mc-dev imports @@ -387,7 +387,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..8c86b03 +index 0000000..3ef5af3 --- /dev/null +++ b/src/main/java/net/minecraft/server/Packet63WorldParticles.java @@ -0,0 +1,51 @@ @@ -410,7 +410,7 @@ index 0000000..8c86b03 + + public Packet63WorldParticles() {} + -+ public void a(DataInputStream datainputstream) { ++ public void a(DataInputStream datainputstream) throws java.io.IOException { + this.a = a(datainputstream, 64); + this.b = datainputstream.readFloat(); + this.c = datainputstream.readFloat(); @@ -422,7 +422,7 @@ index 0000000..8c86b03 + this.i = datainputstream.readInt(); + } + -+ public void a(DataOutputStream dataoutputstream) { ++ public void a(DataOutputStream dataoutputstream) throws java.io.IOException { + a(this.a, dataoutputstream); + dataoutputstream.writeFloat(this.b); + dataoutputstream.writeFloat(this.c); diff --git a/CraftBukkit-Patches/0048-Particle-API.patch b/CraftBukkit-Patches/0048-Particle-API.patch index bf89e3f3b1..434172c08a 100644 --- a/CraftBukkit-Patches/0048-Particle-API.patch +++ b/CraftBukkit-Patches/0048-Particle-API.patch @@ -1,18 +1,17 @@ -From 6108b52c108ecbc37417bfccefa1782e75c19d58 Mon Sep 17 00:00:00 2001 +From 1abe2c72cd1c12141b683cb075c483d902280b1e 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 8c86b03..fa3af32 100644 +index 3ef5af3..f593279 100644 --- a/src/main/java/net/minecraft/server/Packet63WorldParticles.java +++ b/src/main/java/net/minecraft/server/Packet63WorldParticles.java -@@ -17,7 +17,21 @@ public class Packet63WorldParticles extends Packet { +@@ -17,6 +17,20 @@ public class Packet63WorldParticles extends Packet { public Packet63WorldParticles() {} -- public void a(DataInputStream datainputstream) { + // Spigot start - Added constructor + public Packet63WorldParticles(String particleName, float x, float y, float z, float offsetX, float offsetY, float offsetZ, float speed, int count) { + a = particleName; @@ -27,19 +26,9 @@ index 8c86b03..fa3af32 100644 + } + // Spigot end + -+ public void a(DataInputStream datainputstream) throws java.io.IOException { // Spigot - throws IOException + public void a(DataInputStream datainputstream) throws java.io.IOException { this.a = a(datainputstream, 64); this.b = datainputstream.readFloat(); - this.c = datainputstream.readFloat(); -@@ -29,7 +43,7 @@ public class Packet63WorldParticles extends Packet { - this.i = datainputstream.readInt(); - } - -- public void a(DataOutputStream dataoutputstream) { -+ public void a(DataOutputStream dataoutputstream) throws java.io.IOException { // Spigot - throws IOException - a(this.a, dataoutputstream); - dataoutputstream.writeFloat(this.b); - dataoutputstream.writeFloat(this.c); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftEffect.java b/src/main/java/org/bukkit/craftbukkit/CraftEffect.java index 7de0de5..7eca388 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftEffect.java