merge upstream

This commit is contained in:
Ben Kerllenevich
2022-06-08 13:50:11 -04:00
parent 6268dc4452
commit 63b5dc886a
12 changed files with 32 additions and 30 deletions

View File

@@ -27,11 +27,11 @@ index 73f1211470d9626c82c8345037da19aed9db3f23..40c7bf266eccc43faa081ade9402bee5
return true;
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 1671cb165df030bf5a5a8f8fb0aabeaf6e7ac487..0990d2f68e2fec89295f127fef48c7e6f7cd24c0 100644
index 3d5067477f8abbcfece1915013576941a588d021..1f78c8e9cdffc0bb557719404f3834f90b76ff50 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -1446,4 +1446,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
return ret;
@@ -1457,4 +1457,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
return null;
}
// Paper end
+