Update upstream CB, reduce version cache time

Closes GH-602
This commit is contained in:
Zach Brown 2017-02-07 16:29:26 -06:00
parent 7daac312a5
commit e741a89374
4 changed files with 13 additions and 4 deletions

View file

@ -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 {
}
}

View file

@ -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 {

View file

@ -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 {

@ -1 +1 @@
Subproject commit a1d3777d890b6a9ae20b9450c2af9b373e4d3575
Subproject commit 3c48711c053bf7c007964f17135c56d6dfe1fda6