From cdbf59da1dbdd3ce111cb23d72af92668d4f0922 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 31 Aug 2021 23:17:11 -0500
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
https://github.com/PaperMC/Paper/commit/a6151865026f70340268d4db1712a9b04e75b8c2 Remove the old updatingChunks and visibleChunks fields (#6535)
---
 gradle.properties                                 | 2 +-
 patches/server/0001-Airplane-Server-Changes.patch | 6 +++---
 patches/server/0073-Item-entity-immunities.patch  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 13f4d89af..41f4f1119 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ version = 1.17.1-R0.1-SNAPSHOT
 mcVersion = 1.17.1
 packageVersion = 1_17_R1
 
-paperCommit = 2973e1c56e52d28f259b25d685deb59fa3a3fe1f
+paperCommit = a6151865026f70340268d4db1712a9b04e75b8c2
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/server/0001-Airplane-Server-Changes.patch b/patches/server/0001-Airplane-Server-Changes.patch
index 9c37db8ae..dc149c043 100644
--- a/patches/server/0001-Airplane-Server-Changes.patch
+++ b/patches/server/0001-Airplane-Server-Changes.patch
@@ -1694,10 +1694,10 @@ index 7b6c547e71230fbb3733f99a4597b3f5b51547b8..8242200f073aee40482b190c7c0aafd5
          this.setPvpAllowed(dedicatedserverproperties.pvp);
          this.setFlightAllowed(dedicatedserverproperties.allowFlight);
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 730d569bd657049c8165d931ac62bf21c65a3b29..a8dfee5fb36d4fdf90bdd429476427866b2b052d 100644
+index 4386402e5e55438475c48b023c61bfb2dbe71a8f..2eacfbe3512f374169d96ac66c8be5a4f1561b6a 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -2412,8 +2412,28 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
+@@ -2402,8 +2402,28 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
              return ChunkMap.this.level.getServer().getScaledTrackingDistance(initialDistance);
          }
  
@@ -1726,7 +1726,7 @@ index 730d569bd657049c8165d931ac62bf21c65a3b29..a8dfee5fb36d4fdf90bdd42947642786
              Iterator iterator = this.entity.getIndirectPassengers().iterator();
  
              while (iterator.hasNext()) {
-@@ -2425,6 +2445,9 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
+@@ -2415,6 +2435,9 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
                      i = j;
                  }
              }
diff --git a/patches/server/0073-Item-entity-immunities.patch b/patches/server/0073-Item-entity-immunities.patch
index dc741b2a8..97cd4f438 100644
--- a/patches/server/0073-Item-entity-immunities.patch
+++ b/patches/server/0073-Item-entity-immunities.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Item entity immunities
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index a8dfee5fb36d4fdf90bdd429476427866b2b052d..b99a0d754d2becd429d5b38f4aa36ddaa6a00443 100644
+index 2eacfbe3512f374169d96ac66c8be5a4f1561b6a..676b1585233a0824b03894ab3ae6b024c7776bd6 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -2282,7 +2282,7 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
+@@ -2272,7 +2272,7 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
  
      public class TrackedEntity {