Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
f6f9157b Don't toString block unless actually showing the message
b3f0527a Add Spawn Entity SpawnReason API
ec8d7387 MC-183249: Don't generate Carving Masks BitSet unless needed
2d401d2d Improve BlockPosition hashCode/equals
2572bd01 Fix world unload toLowercase - Fixes #3326
dda9680b Optimize brigadier child sorting performance
a71a4ec2 Fix CraftServer.unloadWorld Leak
This commit is contained in:
William Blake Galbreath
2020-05-09 13:18:38 -05:00
parent 3ce3644645
commit 833bd1cc47
9 changed files with 28 additions and 28 deletions

View File

@@ -1,4 +1,4 @@
From 3137c64676b0170b7984033742e003bee6247542 Mon Sep 17 00:00:00 2001
From 2390a607636570bc73eb6a21ddf64e56e7b9bf37 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
@@ -241,10 +241,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 b89f99a66..a1d3bc7ea 100644
index c2b7cb360..07c96d8a9 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -204,7 +204,7 @@ import javax.annotation.Nullable; // Paper
@@ -205,7 +205,7 @@ import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper
public final class CraftServer implements Server {