Move diffs around to compile without later ones applied

1 files changed, 23 insertions, 0 deletions

diff --git a/patches/server/0655-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0655-fix-various-menus-with-empty-level-accesses.patch
new file mode 100644
index 0000000000..efe5d1ddce
--- /dev/null
+++ b/patches/server/0655-fix-various-menus-with-empty-level-accesses.patch
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Sun, 11 Jul 2021 12:52:56 -0700
+Subject: [PATCH] fix various menus with empty level accesses
+
+
+diff --git a/src/main/java/net/minecraft/world/inventory/ContainerLevelAccess.java b/src/main/java/net/minecraft/world/inventory/ContainerLevelAccess.java
+index c96b04f045dda384cdee9254a1765ef97e5f7f03..85e336637db8643fc5aca1dba724c9b341cbf46f 100644
+--- a/src/main/java/net/minecraft/world/inventory/ContainerLevelAccess.java
++++ b/src/main/java/net/minecraft/world/inventory/ContainerLevelAccess.java
+@@ -27,6 +27,12 @@ public interface ContainerLevelAccess {
+         public <T> Optional<T> evaluate(BiFunction<Level, BlockPos, T> getter) {
+             return Optional.empty();
+         }
++        // Paper start - fix menus with empty level accesses
++        @Override
++        public org.bukkit.Location getLocation() {
++            return null;
++        }
++        // Paper end - fix menus with empty level accesses
+     };
+ 
+     static ContainerLevelAccess create(final Level world, final BlockPos pos) {