From e741a893747fa8773ab5358a9e111410cfd6c958 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Tue, 7 Feb 2017 16:29:26 -0600
Subject: [PATCH] Update upstream CB, reduce version cache time

Closes GH-602
---
 Spigot-API-Patches/Check-Paper-versions.patch         | 11 ++++++++++-
 ...nfigurable-Keep-Spawn-Loaded-range-per-world.patch |  2 +-
 ...Delay-Chunk-Unloads-based-on-Player-Movement.patch |  2 +-
 work/CraftBukkit                                      |  2 +-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Spigot-API-Patches/Check-Paper-versions.patch b/Spigot-API-Patches/Check-Paper-versions.patch
index 2774d2b69d..f4a82a5e85 100644
--- a/Spigot-API-Patches/Check-Paper-versions.patch
+++ b/Spigot-API-Patches/Check-Paper-versions.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Check Paper versions
 
 
 diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+index 760d58eb..aae605e9 100644
 --- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
 @@ -0,0 +0,0 @@ import org.json.simple.JSONObject;
@@ -21,6 +21,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public VersionCommand(String name) {
          super(name);
 @@ -0,0 +0,0 @@ public class VersionCommand extends BukkitCommand {
+ 
+     private void sendVersion(CommandSender sender) {
+         if (hasVersion) {
+-            if (System.currentTimeMillis() - lastCheck > 21600000) {
++            if (System.currentTimeMillis() - lastCheck > 7200000) { // Paper - Lower to 2 hours
+                 lastCheck = System.currentTimeMillis();
+                 hasVersion = false;
+             } else {
+@@ -0,0 +0,0 @@ public class VersionCommand extends BukkitCommand {
          }
      }
  
diff --git a/Spigot-Server-Patches/Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 1995b04a5b..ccb1a967b2 100644
--- a/Spigot-Server-Patches/Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -67,7 +67,7 @@ index 540d57855..8cb8cbe2d 100644
              for (int j = -short1; j <= short1; j += 16) {
                  for (int k = -short1; k <= short1; k += 16) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 53fbd38d6..73aee9b0d 100644
+index f65611a6a..9965235ab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -0,0 +0,0 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/Delay-Chunk-Unloads-based-on-Player-Movement.patch
index e008fec710..6e91904457 100644
--- a/Spigot-Server-Patches/Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/Spigot-Server-Patches/Delay-Chunk-Unloads-based-on-Player-Movement.patch
@@ -127,7 +127,7 @@ index 5b27bd1c5..b163346be 100644
  
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 73aee9b0d..5a44a9f38 100644
+index 9965235ab..3f8859a1f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -0,0 +0,0 @@ public class CraftWorld implements World {
diff --git a/work/CraftBukkit b/work/CraftBukkit
index a1d3777d89..3c48711c05 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit a1d3777d890b6a9ae20b9450c2af9b373e4d3575
+Subproject commit 3c48711c053bf7c007964f17135c56d6dfe1fda6