Update to 1.14.1

This commit is contained in:
William Blake Galbreath
2019-05-13 21:34:51 -05:00
parent 8340c3972c
commit 6da8a9ec7f
10 changed files with 55 additions and 240 deletions

View File

@@ -1,4 +1,4 @@
From a9c61ea092067c2508ba72f175fbde0e29602260 Mon Sep 17 00:00:00 2001
From f0f99f77774709baa07af666ddb010f4fb93da02 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 4 May 2019 01:02:11 -0500
Subject: [PATCH] Rebrand
@@ -12,7 +12,7 @@ Subject: [PATCH] Rebrand
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8c18a0c09..dcbf59fbe 100644
index e01d95f17..4955fa3e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,11 +1,11 @@
@@ -22,7 +22,7 @@ index 8c18a0c09..dcbf59fbe 100644
- <artifactId>paper</artifactId>
+ <artifactId>purpur</artifactId>
<packaging>jar</packaging>
<version>1.14-R0.1-SNAPSHOT</version>
<version>1.14.1-R0.1-SNAPSHOT</version>
- <name>Paper</name>
- <url>https://papermc.io</url>
+ <name>Purpur</name>
@@ -83,7 +83,7 @@ index cd6e25923..bb227bc0f 100644
);
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 33c7a295e..f6e27f2fb 100644
index 70f730996..f2b243326 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1405,7 +1405,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -96,7 +96,7 @@ index 33c7a295e..f6e27f2fb 100644
public CrashReport b(CrashReport crashreport) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index d18a530a4..347e3f918 100644
index 56e8a613e..04f214d95 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -200,7 +200,7 @@ import javax.annotation.Nullable; // Paper