Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-07-05 16:40:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict

Browse Source
This commit is contained in:
Telesphoreo 2023-07-22 13:30:03 -05:00
parent 9d489791ee
commit 5c2e147b53
No known key found for this signature in database
GPG Key ID: 68B745F7F8C2FADA
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
worldedit-core/src/main/java/com/fastasyncworldedit/core/util/UpdateNotification.java
View File

@ -36,7 +36,7 @@ public class UpdateNotification {
if (Settings.settings().ENABLED_COMPONENTS.UPDATE_NOTIFICATIONS) { if (Settings.settings().ENABLED_COMPONENTS.UPDATE_NOTIFICATIONS) {
final HttpRequest request = HttpRequest final HttpRequest request = HttpRequest
.newBuilder() .newBuilder()
.uri(URI.create("https://ci.athion.net/job/FastAsyncWorldEdit/api/xml/")) .uri(URI.create("https://ci.plex.us.org/job/Plex-FAWE/api/xml/"))
.timeout(Duration.of(10L, ChronoUnit.SECONDS)) .timeout(Duration.of(10L, ChronoUnit.SECONDS))
.build(); .build();
HttpClient.newHttpClient() HttpClient.newHttpClient()
@ -61,7 +61,7 @@ public class UpdateNotification {
FaweVersion faweVersion = Fawe.instance().getVersion(); FaweVersion faweVersion = Fawe.instance().getVersion();
if (faweVersion.build == 0) { if (faweVersion.build == 0) {
LOGGER.warn("You are using a snapshot or a custom version of FAWE. This is not an official build distributed " + LOGGER.warn("You are using a snapshot or a custom version of FAWE. This is not an official build distributed " +
"via https://www.spigotmc.org/resources/13932/"); "via https://ci.plex.us.org/job/Plex-FAWE/");
return; return;
} }
if (faweVersion.build < Integer.parseInt(UpdateNotification.faweVersion)) { if (faweVersion.build < Integer.parseInt(UpdateNotification.faweVersion)) {
@ -71,7 +71,7 @@ public class UpdateNotification {
""" """
An update for FastAsyncWorldEdit is available. You are {} build(s) out of date. An update for FastAsyncWorldEdit is available. You are {} build(s) out of date.
You are running build {}, the latest version is build {}. You are running build {}, the latest version is build {}.
Update at https://www.spigotmc.org/resources/13932/""", Update at https://ci.plex.us.org/job/Plex-FAWE/""",
versionDifference, versionDifference,
faweVersion.build, faweVersion.build,
UpdateNotification.faweVersion UpdateNotification.faweVersion
@ -98,8 +98,8 @@ public class UpdateNotification {
faweVersion.build, faweVersion.build,
UpdateNotification.faweVersion, UpdateNotification.faweVersion,
TextComponent TextComponent
.of("https://www.spigotmc.org/resources/13932/") .of("https://ci.plex.us.org/job/Plex-FAWE/")
.clickEvent(ClickEvent.openUrl("https://www.spigotmc.org/resources/13932/")) .clickEvent(ClickEvent.openUrl("https://ci.plex.us.org/job/Plex-FAWE/"))
)); ));
} }
} }