mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Silence BeaconEffectEvent, swallow exception in version checking

Browse source
This commit is contained in:
Zach Brown 2016-03-03 04:48:46 -06:00
parent 6287e97b6b
commit a54fb8d270
2 changed files with 62 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Spigot-API-Patches/0006-Check-Paper-versions.patch
View file

@ -1,11 +1,11 @@
From 7d9c89c650173fed78c662109eea960d61b6e678 Mon Sep 17 00:00:00 2001
From 8944bee4927eb1d51651160612345a139ef645ca Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 Feb 2016 17:58:01 -0600
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 b55abdb..e1bea95 100644
index b55abdb..ad3a9e5 100644
--- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
@@ -185,30 +185,17 @@ public class VersionCommand extends BukkitCommand {
@ -62,12 +62,13 @@ index b55abdb..e1bea95 100644
- JSONObject obj = (JSONObject) new JSONParser().parse(reader);
- return ((Number) obj.get("totalCount")).intValue();
- } catch (ParseException ex) {
- ex.printStackTrace();
+ // Paper start
+ int newVer = Integer.decode(reader.readLine());
+ int currentVer = Integer.decode(currentVerInt);
+ return newVer - currentVer;
+ } catch (NumberFormatException ex) {
ex.printStackTrace();
+ //ex.printStackTrace();
+ // Paper end
return -1;
} finally {