From 310105c9c0401a2e427eab171105efd19b28865c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 19 Dec 2016 22:58:12 -0500
Subject: [PATCH] Update upstream

---
 .../Fix-worldborder-bug.patch                 | 21 -------------------
 work/CraftBukkit                              |  2 +-
 work/Spigot                                   |  2 +-
 3 files changed, 2 insertions(+), 23 deletions(-)
 delete mode 100644 Spigot-Server-Patches/Fix-worldborder-bug.patch

diff --git a/Spigot-Server-Patches/Fix-worldborder-bug.patch b/Spigot-Server-Patches/Fix-worldborder-bug.patch
deleted file mode 100644
index 2f562aaef9..0000000000
--- a/Spigot-Server-Patches/Fix-worldborder-bug.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Mon, 19 Dec 2016 01:23:03 -0500
-Subject: [PATCH] Fix worldborder bug
-
-typo in variable name
-
-diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java
-index 2252fb03f..215e6f5d0 100644
---- a/src/main/java/net/minecraft/server/WorldBorder.java
-+++ b/src/main/java/net/minecraft/server/WorldBorder.java
-@@ -0,0 +0,0 @@ public class WorldBorder {
- 
-     // Inlined the getters from ChunkCoordIntPair
-     public boolean isInBounds(int x, int z) {
--        return (double) ((x  << 4) + 15) > this.b() && (double) (x << 4) < this.d() && (double) ((z  << 4) + 15) > this.c() && (double) (x << 4) < this.e();
-+        return (double) ((x  << 4) + 15) > this.b() && (double) (x << 4) < this.d() && (double) ((z  << 4) + 15) > this.c() && (double) (z << 4) < this.e(); // Paper - fix CraftBukkit bug
-     }
- 
-     public boolean a(AxisAlignedBB axisalignedbb) {
---
\ No newline at end of file
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 4602331b1d..c8ff65136f 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 4602331b1dfe3699e054bcde8b8bd5670eb1046b
+Subproject commit c8ff65136f23a3c2770b8d9ca508f61927f8acba
diff --git a/work/Spigot b/work/Spigot
index aad97c46dc..6f7aabf0f7 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit aad97c46dc16cdb9acc1117709590ebd96c19b66
+Subproject commit 6f7aabf0f73188de2433ec4570412235772f8fba