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

Update to 1.14

Browse Source
This commit is contained in:
William Blake Galbreath
2019-05-06 22:37:10 -05:00
committed by BillyGalbreath
parent a4bfd94c63
commit b8fed8aaf2
16 changed files with 726 additions and 671 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,18 +1,18 @@
From 54a9be260f9d24b37ddf635cd8b7cfee6ab99bf5 Mon Sep 17 00:00:00 2001
From 7b6ccc334157135036716bd93907cbb34f28cd82 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 | 8 +++----
pom.xml | 9 ++++----
.../command/defaults/VersionCommand.java | 21 +++++++++++--------
2 files changed, 16 insertions(+), 13 deletions(-)
2 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/pom.xml b/pom.xml
index 13cdc25f..1e24fd1e 100644
index 81aefdf7..d73f48ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,17 +4,17 @@
@@ -4,18 +4,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -23,9 +23,10 @@ index 13cdc25f..1e24fd1e 100644
<version>dev-SNAPSHOT</version>
</parent>
- <groupId>com.destroystokyo.paper</groupId>
- <artifactId>paper-api</artifactId>
+ <artifactId>purpur-api</artifactId>
<version>1.13.2-R0.1-SNAPSHOT</version>
<version>1.14-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Paper-API</name>
@@ -35,10 +36,10 @@ index 13cdc25f..1e24fd1e 100644
<properties>
diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
index ee07fe5e..0c4e8604 100644
index a36ab04c..42c88ae1 100644
--- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
@@ -214,8 +214,8 @@ public class VersionCommand extends BukkitCommand {
@@ -211,8 +211,8 @@ public class VersionCommand extends BukkitCommand {
private void obtainVersion() {
String version = Bukkit.getVersion();
if (version == null) version = "Custom";
@@ -49,7 +50,7 @@ index ee07fe5e..0c4e8604 100644
int distance = getDistance(null, parts[0]);
switch (distance) {
case -1:
@@ -266,13 +266,16 @@ public class VersionCommand extends BukkitCommand {
@@ -263,13 +263,16 @@ public class VersionCommand extends BukkitCommand {
// Paper start
private static int getDistance(@NotNull String repo, @NotNull String verInfo) {