Updated Upstream (Paper & Airplane)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
47d48790d Change return type of ItemStack#editMeta to allow checking for successful vs non-successful edits
7aabe7d56 [CI-SKIP] fix minecart vs minecraft typos (#5713)
f775e87b4 [CI-SKIP] ci: update setup-java action (#5710)
c58b3b277 ci: replace Java 11 with Java 16 in GH Actions build flow (#5709)
4b72327a6 ItemStack#editMeta
68984b664 Add Unix domain socket support (#5611)
68c67e680 Add Mob#lookAt API (#5633)
4bacecd16 [Auto] Updated Upstream (Bukkit/CraftBukkit)
1f28e6eeb Fix default ChatRenderer when no plugins are installed (#5702)
ecb0d32ca Enhance (Async)ChatEvent with per-viewer rendering API (#5684)

Airplane Changes:
636dbff0f [ci skip] Cleanup mcdev import files
c57932048 [ci skip] Remove icons
7ada9a476 [skip ci] Need to specify 1.16.5 in the README of course
813df1a44 Update README
daf3f0b29 Optimize air case for raytracing
This commit is contained in:
BillyGalbreath
2021-05-23 23:22:01 -05:00
parent 1343a05085
commit f9ccf6ddbc
22 changed files with 51 additions and 62 deletions

View File

@@ -29,10 +29,10 @@ index 8ba25be0ea59483e824be9afc63d47cb75b5b334..61603bda0d1e305679ab2463188c3f6c
this.isRestarting = isRestarting;
this.hasLoggedStop = true; // Paper
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index cbccb889167f8e235f417e224bbf5f025a6304f5..df6eaa94f2928242dbd69a918d0b0b919bd3436b 100644
index b1ce70267506cde21dbb17d6ff19d13383e8c178..7773f15f4eabb73b16ce971971f0c6c7625998ed 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -325,6 +325,8 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -342,6 +342,8 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
MinecraftServerBeans.a((MinecraftServer) this);
}