Repo-Mirror/DivineMC
9
0
Fork 0
mirror of https://github.com/BX-Team/DivineMC.git synced 2025-12-29 11:49:19 +00:00
Code Issues Releases Activity

fix build bug

Browse Source
This commit is contained in:
NONPLAYT
2023-03-27 02:36:16 +03:00
parent d24cbfd514
commit 18856e63e1
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
patches/server/0001-Divine-Branding.patch
View File

@@ -130,14 +130,14 @@ index 0000000000000000000000000000000000000000..953451b808fc134b047dcf7b3b1379bc
+ try {
+ final HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
+ if (response.statusCode() != 200) {
+ return text("Received invalid status code (" response.statusCode() ") from server.", RED);
+ return text("Received invalid status code (" + response.statusCode() + ") from server.", RED);
+ }
+
+ int latestVersionNumber;
+ try {
+ latestVersionNumber = Integer.parseInt(response.body());
+ } catch (NumberFormatException e) {
+ LOGGER.log(Level.WARNING, "Received invalid response from Jenkins \"" response.body() "\".");
+ LOGGER.log(Level.WARNING, "Received invalid response from Jenkins \"" + response.body() + "\".");
+ return text("Received invalid response from server.", RED);
+ }
+
@@ -157,7 +157,7 @@ index 0000000000000000000000000000000000000000..953451b808fc134b047dcf7b3b1379bc
+ try {
+ final HttpResponse<JsonObject> response = client.send(request, JSON_OBJECT_BODY_HANDLER);
+ if (response.statusCode() != 200) {
+ return text("Received invalid status code (" response.statusCode() ") from server.", RED);
+ return text("Received invalid status code (" + response.statusCode() + ") from server.", RED);
+ }
+
+ final JsonObject obj = response.body();
@@ -175,8 +175,8 @@ index 0000000000000000000000000000000000000000..953451b808fc134b047dcf7b3b1379bc
+ return switch (Math.max(-1, Math.min(1, versionDiff))) {
+ case -1 -> text("You are running an unsupported version of DivineMC.", RED);
+ case 0 -> text("You are on the latest version!", GREEN);
+ default -> text("You are running " versionDiff " version" (versionDiff == 1 ? "" : "s") " beyond. "
+ "Please update your server when possible to maintain stability, security, and receive the latest optimizations.", RED);
+ default -> text("You are running " + versionDiff + " version" + (versionDiff == 1 ? "" : "s") + " beyond. " +
+ "Please update your server when possible to maintain stability, security, and receive the latest optimizations.", RED);
+ };
+ }
+
@@ -192,10 +192,9 @@ index 0000000000000000000000000000000000000000..953451b808fc134b047dcf7b3b1379bc
+ return null;
+ }
+
+ return text("Previous version: " oldVersion, NamedTextColor.GRAY, TextDecoration.ITALIC);
+ return text("Previous version: " + oldVersion, NamedTextColor.GRAY, TextDecoration.ITALIC);
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index bc1a2df0a7ddaf030917e4723994464d77e55d02..2caf9913a22dbc895aca060e89c53b8ec21a85d4 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java