From 14f6bee0a18acc6a71e9c1eb138d1d9d22dc1c54 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Tue, 12 Apr 2016 11:31:54 -0500
Subject: [PATCH] Update upstream

---
 Spigot-Server-Patches/16w14a-memory-cleanup.patch | 14 --------------
 scripts/importmcdev.sh                            |  1 -
 work/CraftBukkit                                  |  2 +-
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/Spigot-Server-Patches/16w14a-memory-cleanup.patch b/Spigot-Server-Patches/16w14a-memory-cleanup.patch
index ad9a11bc47..8b8140e660 100644
--- a/Spigot-Server-Patches/16w14a-memory-cleanup.patch
+++ b/Spigot-Server-Patches/16w14a-memory-cleanup.patch
@@ -22,20 +22,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
      protected PathPoint a(int i, int j, int k) {
          int l = PathPoint.b(i, j, k);
-diff --git a/src/main/java/net/minecraft/server/PathfinderNormal.java b/src/main/java/net/minecraft/server/PathfinderNormal.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/PathfinderNormal.java
-+++ b/src/main/java/net/minecraft/server/PathfinderNormal.java
-@@ -0,0 +0,0 @@ public class PathfinderNormal extends PathfinderAbstract {
-     }
- 
-     public void a() {
--        super.a();
-         this.b.a(PathType.WATER, this.j);
-+        super.a(); // Paper - 16w14a backports
-     }
- 
-     public PathPoint b() {
 diff --git a/src/main/java/net/minecraft/server/PathfinderWater.java b/src/main/java/net/minecraft/server/PathfinderWater.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/PathfinderWater.java
diff --git a/scripts/importmcdev.sh b/scripts/importmcdev.sh
index e708c2990e..462ebf44dd 100755
--- a/scripts/importmcdev.sh
+++ b/scripts/importmcdev.sh
@@ -60,7 +60,6 @@ import PacketPlayOutTitle
 import PacketPlayOutUpdateTime
 import PathfinderAbstract
 import PathfinderGoalFloat
-import PathfinderNormal
 import PathfinderWater
 import PersistentVillage
 import TileEntityEnderChest
diff --git a/work/CraftBukkit b/work/CraftBukkit
index a28f87a55c..f6313791d0 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit a28f87a55c1eef87d4f9b88dafc0996d00d6b20a
+Subproject commit f6313791d0f8575e4a3a35c11145f794b8acedd4