Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
a96d3e89 [Auto] Updated Upstream (CraftBukkit)
This commit is contained in:
William Blake Galbreath
2020-07-01 20:56:22 -05:00
parent 3b4e44ff44
commit eed34befaa
10 changed files with 35 additions and 35 deletions

View File

@@ -1,4 +1,4 @@
From 1785535c59fd991e1c0eeb05bd4834135cb1cfbe Mon Sep 17 00:00:00 2001
From eecd43452be61d472ae36cbaf2a54f3fdd83a8f9 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
@@ -243,10 +243,10 @@ index 000000000..d8b408f06
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index cebcb845b..56a2db25f 100644
index 2d042e058..a083aeb5d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -229,7 +229,7 @@ import javax.annotation.Nullable; // Paper
@@ -231,7 +231,7 @@ import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper
public final class CraftServer implements Server {