From 50ff48ffba14c3efb191b32a8c16b0976ff5d7d4 Mon Sep 17 00:00:00 2001
From: Shaun Bennett <phination@me.com>
Date: Wed, 22 Apr 2015 16:20:39 -0400
Subject: [PATCH] Packet changes to spigot build

---
 .../0030-Mineplex-Entity-Changes.patch        |   2 +-
 .../0158-Mineplex-Chunk-Changes.patch         |   2 +-
 ....patch => 0160-Mineplex-Ignore-EULA.patch} |   2 +-
 ...tch => 0161-Mineplex-Entity-Changes.patch} |   2 +-
 ...tch => 0162-Mineplex-Packet-Changes.patch} |  18 +++++++++++++++++-
 ...163-Mineplex-Item-Inventory-Changes.patch} |   2 +-
 ...atch => 0164-Mineplex-World-Changes.patch} |   2 +-
 Plugins/Libraries/craftbukkit.jar             | Bin 21557245 -> 21557245 bytes
 8 files changed, 23 insertions(+), 7 deletions(-)
 rename Patches/CraftBukkit-Patches/{0159-Mineplex-Ignore-EULA.patch => 0160-Mineplex-Ignore-EULA.patch} (93%)
 rename Patches/CraftBukkit-Patches/{0160-Mineplex-Entity-Changes.patch => 0161-Mineplex-Entity-Changes.patch} (99%)
 rename Patches/CraftBukkit-Patches/{0161-Mineplex-Packet-Changes.patch => 0162-Mineplex-Packet-Changes.patch} (98%)
 rename Patches/CraftBukkit-Patches/{0162-Mineplex-Item-Inventory-Changes.patch => 0163-Mineplex-Item-Inventory-Changes.patch} (99%)
 rename Patches/CraftBukkit-Patches/{0163-Mineplex-World-Changes.patch => 0164-Mineplex-World-Changes.patch} (94%)

diff --git a/Patches/Bukkit-Patches/0030-Mineplex-Entity-Changes.patch b/Patches/Bukkit-Patches/0030-Mineplex-Entity-Changes.patch
index c9ad858a7..6d4f1a800 100644
--- a/Patches/Bukkit-Patches/0030-Mineplex-Entity-Changes.patch
+++ b/Patches/Bukkit-Patches/0030-Mineplex-Entity-Changes.patch
@@ -1,4 +1,4 @@
-From 1826c70f0d5e8cd6161b7fb78f1cec042f0c2cbd Mon Sep 17 00:00:00 2001
+From 95da114a0184f29b4765b90e81c5a5d3be025a08 Mon Sep 17 00:00:00 2001
 From: Shaun Bennett <phination@me.com>
 Date: Tue, 21 Apr 2015 19:12:35 -0400
 Subject: [PATCH] Mineplex - Entity Changes
diff --git a/Patches/CraftBukkit-Patches/0158-Mineplex-Chunk-Changes.patch b/Patches/CraftBukkit-Patches/0158-Mineplex-Chunk-Changes.patch
index 07130610f..a4b24f156 100644
--- a/Patches/CraftBukkit-Patches/0158-Mineplex-Chunk-Changes.patch
+++ b/Patches/CraftBukkit-Patches/0158-Mineplex-Chunk-Changes.patch
@@ -1,4 +1,4 @@
-From ae9ac1273b240b9fc5209bd5c7fe59bf1072e944 Mon Sep 17 00:00:00 2001
+From a5eac8e0980212f40add58f975a652313d6a1a3d Mon Sep 17 00:00:00 2001
 From: Shaun Bennett <phination@me.com>
 Date: Sun, 19 Apr 2015 01:54:13 -0400
 Subject: [PATCH] Mineplex - Chunk Changes
diff --git a/Patches/CraftBukkit-Patches/0159-Mineplex-Ignore-EULA.patch b/Patches/CraftBukkit-Patches/0160-Mineplex-Ignore-EULA.patch
similarity index 93%
rename from Patches/CraftBukkit-Patches/0159-Mineplex-Ignore-EULA.patch
rename to Patches/CraftBukkit-Patches/0160-Mineplex-Ignore-EULA.patch
index 3ec80d4d8..5537ab283 100644
--- a/Patches/CraftBukkit-Patches/0159-Mineplex-Ignore-EULA.patch
+++ b/Patches/CraftBukkit-Patches/0160-Mineplex-Ignore-EULA.patch
@@ -1,4 +1,4 @@
-From ea05a1c2416044cfea21d0442675b0094dbaecab Mon Sep 17 00:00:00 2001
+From d9962d706bd608053c454e7b3c4561eb0ea7acaf Mon Sep 17 00:00:00 2001
 From: Shaun Bennett <phination@me.com>
 Date: Sun, 19 Apr 2015 02:01:08 -0400
 Subject: [PATCH] Mineplex - Ignore EULA
diff --git a/Patches/CraftBukkit-Patches/0160-Mineplex-Entity-Changes.patch b/Patches/CraftBukkit-Patches/0161-Mineplex-Entity-Changes.patch
similarity index 99%
rename from Patches/CraftBukkit-Patches/0160-Mineplex-Entity-Changes.patch
rename to Patches/CraftBukkit-Patches/0161-Mineplex-Entity-Changes.patch
index 064e460e1..edd22aea6 100644
--- a/Patches/CraftBukkit-Patches/0160-Mineplex-Entity-Changes.patch
+++ b/Patches/CraftBukkit-Patches/0161-Mineplex-Entity-Changes.patch
@@ -1,4 +1,4 @@
-From 03e6d60b6ac992d560d2a404e3eae2f63085edda Mon Sep 17 00:00:00 2001
+From a253848782274cb79da16e13e8b5560fa2754a54 Mon Sep 17 00:00:00 2001
 From: Shaun Bennett <phination@me.com>
 Date: Tue, 21 Apr 2015 19:12:35 -0400
 Subject: [PATCH] Mineplex - Entity Changes
diff --git a/Patches/CraftBukkit-Patches/0161-Mineplex-Packet-Changes.patch b/Patches/CraftBukkit-Patches/0162-Mineplex-Packet-Changes.patch
similarity index 98%
rename from Patches/CraftBukkit-Patches/0161-Mineplex-Packet-Changes.patch
rename to Patches/CraftBukkit-Patches/0162-Mineplex-Packet-Changes.patch
index fe646fb5a..a1859dfa3 100644
--- a/Patches/CraftBukkit-Patches/0161-Mineplex-Packet-Changes.patch
+++ b/Patches/CraftBukkit-Patches/0162-Mineplex-Packet-Changes.patch
@@ -1,4 +1,4 @@
-From e218bdb001b6480be6e7aa4118a8b5c2a88aa598 Mon Sep 17 00:00:00 2001
+From f90c694774b01f4ee2d567f4d4a66c7c879c1fb9 Mon Sep 17 00:00:00 2001
 From: Shaun Bennett <phination@me.com>
 Date: Tue, 21 Apr 2015 19:48:02 -0400
 Subject: [PATCH] Mineplex - Packet Changes
@@ -176,6 +176,22 @@ index 0000000..6e17e4b
 +    }
 +}
 \ No newline at end of file
+diff --git a/src/main/java/net/minecraft/server/PacketPlayOutChat.java b/src/main/java/net/minecraft/server/PacketPlayOutChat.java
+index 6cd5df2..5acec91 100644
+--- a/src/main/java/net/minecraft/server/PacketPlayOutChat.java
++++ b/src/main/java/net/minecraft/server/PacketPlayOutChat.java
+@@ -4,9 +4,9 @@ import java.io.IOException;
+ 
+ public class PacketPlayOutChat implements Packet<PacketListenerPlayOut> {
+ 
+-    private IChatBaseComponent a;
++    public IChatBaseComponent a;
+     public net.md_5.bungee.api.chat.BaseComponent[] components; // Spigot
+-    private byte b;
++    public byte b;
+ 
+     public PacketPlayOutChat() {}
+ 
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
 new file mode 100644
 index 0000000..702d33d
diff --git a/Patches/CraftBukkit-Patches/0162-Mineplex-Item-Inventory-Changes.patch b/Patches/CraftBukkit-Patches/0163-Mineplex-Item-Inventory-Changes.patch
similarity index 99%
rename from Patches/CraftBukkit-Patches/0162-Mineplex-Item-Inventory-Changes.patch
rename to Patches/CraftBukkit-Patches/0163-Mineplex-Item-Inventory-Changes.patch
index 21c51d947..66445a502 100644
--- a/Patches/CraftBukkit-Patches/0162-Mineplex-Item-Inventory-Changes.patch
+++ b/Patches/CraftBukkit-Patches/0163-Mineplex-Item-Inventory-Changes.patch
@@ -1,4 +1,4 @@
-From f41348c5d0e7540905fca648b076234fabb63db1 Mon Sep 17 00:00:00 2001
+From b14ca01b935d90e9ee24790c6386de9f3b97b1c8 Mon Sep 17 00:00:00 2001
 From: Shaun Bennett <phination@me.com>
 Date: Tue, 21 Apr 2015 19:56:41 -0400
 Subject: [PATCH] Mineplex - Item/Inventory Changes
diff --git a/Patches/CraftBukkit-Patches/0163-Mineplex-World-Changes.patch b/Patches/CraftBukkit-Patches/0164-Mineplex-World-Changes.patch
similarity index 94%
rename from Patches/CraftBukkit-Patches/0163-Mineplex-World-Changes.patch
rename to Patches/CraftBukkit-Patches/0164-Mineplex-World-Changes.patch
index c8e1e170c..2385215bd 100644
--- a/Patches/CraftBukkit-Patches/0163-Mineplex-World-Changes.patch
+++ b/Patches/CraftBukkit-Patches/0164-Mineplex-World-Changes.patch
@@ -1,4 +1,4 @@
-From 3a9421a5ab5ebab8ec294d8c32e321080b07d56e Mon Sep 17 00:00:00 2001
+From 60a4fc4ae5d4c5c147dd64ee3f08342fb07a4edc Mon Sep 17 00:00:00 2001
 From: Shaun Bennett <phination@me.com>
 Date: Tue, 21 Apr 2015 19:58:54 -0400
 Subject: [PATCH] Mineplex - World Changes
diff --git a/Plugins/Libraries/craftbukkit.jar b/Plugins/Libraries/craftbukkit.jar
index aa181f550c4c40c76eb9e7f2e9a9fbc99ecf6af2..3730c9779caf031015e808814077859a2b64ab67 100644
GIT binary patch
delta 2530
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
CkX``*

delta 2530
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
DkAqH2