Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update upstream

Browse Source
This commit is contained in:
William Blake Galbreath
2019-05-27 09:44:31 -05:00
parent b4a9e34f46
commit d03525d9f3
5 changed files with 152 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
patches/api/0001-Rebrand.patch
View File

@@ -1,12 +1,11 @@
From 85f4ec173933924204aaaa98c5011d248f22ec50 Mon Sep 17 00:00:00 2001
From 795f3007cf8f327486ac944f86de331532290c47 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 4 May 2019 00:57:16 -0500
Subject: [PATCH] Rebrand
---
pom.xml | 13 ++++++-------
.../org/bukkit/command/defaults/VersionCommand.java | 8 ++++----
2 files changed, 10 insertions(+), 11 deletions(-)
pom.xml | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index dbbb5c72f..ea0ab736d 100644
@@ -45,39 +44,6 @@ index dbbb5c72f..ea0ab736d 100644
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
index ece8d1c8a..2909e9ecf 100644
--- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
@@ -211,8 +211,8 @@ public class VersionCommand extends BukkitCommand {
private void obtainVersion() {
String version = Bukkit.getVersion();
if (version == null) version = "Custom";
- if (version.startsWith("git-Paper-")) {
- String[] parts = version.substring("git-Paper-".length()).split("[-\\s]");
+ if (version.startsWith("git-Purpur-")) { // Purpur
+ String[] parts = version.substring("git-Purpur-".length()).split("[-\\s]"); // Purpur
int distance = getDistance(null, parts[0]);
switch (distance) {
case -1:
@@ -268,7 +268,7 @@ public class VersionCommand extends BukkitCommand {
return getFromJenkins(currentVer);
} catch (NumberFormatException ex) {
verInfo = verInfo.replace("\"", "");
- return getFromRepo("PaperMC/Paper", "ver/1.14", verInfo); // Just for now
+ return getFromRepo("pl3xgaming/Purpur", "master", verInfo); // Purpur
}
/*
BufferedReader reader = Resources.asCharSource(
@@ -290,7 +290,7 @@ public class VersionCommand extends BukkitCommand {
private static int getFromJenkins(int currentVer) {
try {
BufferedReader reader = Resources.asCharSource(
- new URL("https://ci.destroystokyo.com/job/Paper-1.14/lastSuccessfulBuild/buildNumber"), // Paper
+ new URL("https://ci.pl3x.net/job/Purpur/lastSuccessfulBuild/buildNumber"), // Purpur // Paper
Charsets.UTF_8
).openBufferedStream();
try {
--
2.20.1