Updated Upstream (Paper, Tuinity, & Airplane)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
f3e541ca1 Actually list all missing hard depends (#5701)
11f83fe8e [CI-SKIP] [Auto] Rebuild Patches
a36e5d65f MC-148809: Fix incorrect structure block data length

Tuinity Changes:
f0e91a4ae Update Upstream (Paper)

Airplane Changes:
50babee71 Update Upstream (Tuinity)
85e0c63f5 Revert "Allow plugins to stupidly replace server internals"
db3fe2c70 Remove auto import
6b32e01eb Allow plugins to stupidly replace server internals
f849f00fc Flare update
ac10e43a9 Flare update
This commit is contained in:
BillyGalbreath
2021-05-21 17:25:06 -05:00
parent af2dd61af0
commit 1343a05085
10 changed files with 47 additions and 57 deletions

View File

@@ -27,10 +27,10 @@ index d126f668828e0788e369294c0b376ef52b344f2c..154a76b1b77a97bdf65153250c41275f
return true;
diff --git a/src/main/java/net/minecraft/world/level/World.java b/src/main/java/net/minecraft/world/level/World.java
index adfb33278901677a5f63452813e284baebdaa7f3..66dadc03972020810e7b4c76188f536cad8149cf 100644
index fc5e2263d05661672b3295da46d7e7495c5b40b6..8382d0f3158da3c90bba082e62411998632c3644 100644
--- a/src/main/java/net/minecraft/world/level/World.java
+++ b/src/main/java/net/minecraft/world/level/World.java
@@ -1836,4 +1836,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -1833,4 +1833,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
public final boolean isDebugWorld() {
return this.debugWorld;
}