Skip to content

Commit f38c393

Browse files
committed
Use new Spigot updater
Fixes #746
1 parent 22c2a4a commit f38c393

File tree

2 files changed

+8
-11
lines changed

2 files changed

+8
-11
lines changed

src/main/java/com/comphenix/protocol/updater/SpigotUpdater.java

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -88,20 +88,15 @@ public void run() {
8888
}
8989
}
9090

91-
private static final String PROTOCOL = "https://";
92-
private static final String RESOURCE_URL = PROTOCOL + "www.spigotmc.org/resources/protocollib.1997/";
93-
private static final String API_URL = PROTOCOL + "www.spigotmc.org/api/general.php";
94-
private static final String ACTION = "POST";
95-
96-
private static final int ID = 1997;
97-
private static final byte[] API_KEY = ("key=98BE0FE67F88AB82B4C197FAF1DC3B69206EFDCC4D3B80FC83A00037510B99B4&resource=" + ID).getBytes(Charsets.UTF_8);
91+
private static final String RESOURCE_URL = "https://www.spigotmc.org/resources/protocollib.1997/";
92+
private static final String UPDATE_URL = "https://api.spigotmc.org/legacy/update.php?resource=1997";
93+
private static final String ACTION = "GET";
9894

9995
public String getSpigotVersion() throws IOException {
10096
try (Closer closer = Closer.create()) {
101-
HttpURLConnection con = (HttpURLConnection) new URL(API_URL).openConnection();
97+
HttpURLConnection con = (HttpURLConnection) new URL(UPDATE_URL).openConnection();
10298
con.setDoOutput(true);
10399
con.setRequestMethod(ACTION);
104-
con.getOutputStream().write(API_KEY);
105100

106101
InputStreamReader isr = closer.register(new InputStreamReader(con.getInputStream()));
107102
BufferedReader br = closer.register(new BufferedReader(isr));

src/test/java/com/comphenix/protocol/updater/UpdaterTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
import org.bukkit.Server;
1313
import org.bukkit.plugin.Plugin;
1414
import org.bukkit.plugin.PluginDescriptionFile;
15+
import org.junit.BeforeClass;
16+
import org.junit.Test;
1517

1618
import com.comphenix.protocol.updater.Updater.UpdateType;
1719

@@ -23,14 +25,14 @@ public class UpdaterTest {
2325
private static final int BUKKIT_DEV_ID = 45564;
2426
private static Plugin plugin;
2527

26-
// @BeforeClass
28+
@BeforeClass
2729
public static void preparePlugin() {
2830
Server server = mock(Server.class);
2931
when(server.getUpdateFolder()).thenReturn(null);
3032

3133
plugin = mock(Plugin.class);
3234
String version = System.getProperty("projectVersion");
33-
if (version == null) version = "4.2.1";
35+
if (version == null) version = "4.4.0";
3436
when(plugin.getDescription()).thenReturn(new PluginDescriptionFile("ProtocolLib", version, null));
3537
when(plugin.getLogger()).thenReturn(Logger.getLogger("ProtocolLib"));
3638
when(plugin.getDataFolder()).thenReturn(null);

0 commit comments

Comments
 (0)