From 7e83323ab74b3f523df9cf9f761bb183eaffef86 Mon Sep 17 00:00:00 2001
From: Aurora <aurora@relanet.eu>
Date: Mon, 14 Jun 2021 17:10:25 +0200
Subject: [PATCH] fix compile issues

---
 ...on-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch | 2 +-
 ...mize-isValidLocation-getType-and-getBlockData-fo.patch | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/patches/server/Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/patches/server/Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
index 1f63371dbb..a6f3949f00 100644
--- a/patches/server/Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
+++ b/patches/server/Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
@@ -12,7 +12,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
  
      public void blockChanged(BlockPos pos) {
-+        if (!blockposition.isValidLocation()) return; // Paper - SPIGOT-6086 for all invalid locations; avoid acquiring locks
++        if (!pos.isValidLocation(levelHeightAccessor)) return; // Paper - SPIGOT-6086 for all invalid locations; avoid acquiring locks
          LevelChunk chunk = this.getSendingChunk(); // Paper - no-tick view distance
  
          if (chunk != null) {
diff --git a/patches/server/Optimize-isValidLocation-getType-and-getBlockData-fo.patch b/patches/server/Optimize-isValidLocation-getType-and-getBlockData-fo.patch
index 51cfa95f8b..cf294cdb86 100644
--- a/patches/server/Optimize-isValidLocation-getType-and-getBlockData-fo.patch
+++ b/patches/server/Optimize-isValidLocation-getType-and-getBlockData-fo.patch
@@ -21,11 +21,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      private int z;
  
 +    // Paper start
-+    public boolean isValidLocation(net.minecraft.world.level.Level level) {
-+        return getX() >= -30000000 && getZ() >= -30000000 && getX() < 30000000 && getZ() < 30000000 && !level.isOutsideBuildHeight(getY());
++    public boolean isValidLocation(net.minecraft.world.level.LevelHeightAccessor levelHeightAccessor) {
++        return getX() >= -30000000 && getZ() >= -30000000 && getX() < 30000000 && getZ() < 30000000 && !levelHeightAccessor.isOutsideBuildHeight(getY());
 +    }
-+    public boolean isInvalidYLocation(net.minecraft.world.level.Level level) {
-+        return level.isOutsideBuildHeight(getY());
++    public boolean isInvalidYLocation(net.minecraft.world.level.LevelHeightAccessor levelHeightAccessor) {
++        return levelHeightAccessor.isOutsideBuildHeight(getY());
 +    }
 +    // Paper end
 +