From 189235906daf0622ea01004e7b67a31f6db790d1 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 12 Apr 2016 11:31:54 -0500
Subject: [PATCH] Update upstream

---
 .../0131-16w14a-memory-cleanup.patch             | 16 +---------------
 scripts/importmcdev.sh                           |  1 -
 work/CraftBukkit                                 |  2 +-
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/Spigot-Server-Patches/0131-16w14a-memory-cleanup.patch b/Spigot-Server-Patches/0131-16w14a-memory-cleanup.patch
index 540ee5fa7..4bd07faf0 100644
--- a/Spigot-Server-Patches/0131-16w14a-memory-cleanup.patch
+++ b/Spigot-Server-Patches/0131-16w14a-memory-cleanup.patch
@@ -1,4 +1,4 @@
-From 69a4afa23cc7540a32edb3561eeacd3a5e7ace45 Mon Sep 17 00:00:00 2001
+From 92192f36f2eed7394532ea5778417ea4668afebe Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 7 Apr 2016 18:28:06 -0500
 Subject: [PATCH] 16w14a memory cleanup
@@ -22,20 +22,6 @@ index 51f3758..acbc70a 100644
  
      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 0e4fa08..4f1df46 100644
---- a/src/main/java/net/minecraft/server/PathfinderNormal.java
-+++ b/src/main/java/net/minecraft/server/PathfinderNormal.java
-@@ -16,8 +16,8 @@ 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 dc7f310..c1df684 100644
 --- a/src/main/java/net/minecraft/server/PathfinderWater.java
diff --git a/scripts/importmcdev.sh b/scripts/importmcdev.sh
index e708c2990..462ebf44d 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 a28f87a55..f6313791d 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit a28f87a55c1eef87d4f9b88dafc0996d00d6b20a
+Subproject commit f6313791d0f8575e4a3a35c11145f794b8acedd4