From 3ff85ed726642e2036246d8dbd7c1e719e6b0cda Mon Sep 17 00:00:00 2001
From: granny <granny@pl3x.net>
Date: Fri, 17 Sep 2021 18:50:32 -0700
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@ce7516d Fix global limit display for MISC mob category (PaperMC/Paper#6612)
PaperMC/Paper@0680f4f fix per-player-mob-spawns cause total limit cap by Bukkit's spawn limit (PaperMC/Paper#6574)
PaperMC/Paper@0d19cd7 Legacy data should look for legacy materials (Fixes PaperMC/Paper#6618)
---
 gradle.properties                                 | 2 +-
 patches/server/0001-Airplane-Server-Changes.patch | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index f9ba48691..9b41845b4 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 = 3069eaee04730c12dcc5000c44fe3ef640ce7d38
+paperCommit = 0d19cd7241ad0321d5301c45a7f35d0f61aaf0de
 
 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 ef9216733..ddd920e4b 100644
--- a/patches/server/0001-Airplane-Server-Changes.patch
+++ b/patches/server/0001-Airplane-Server-Changes.patch
@@ -2919,10 +2919,10 @@ index b93056b91e7ebd49e6ddb53ccb6c05c056088df9..6f4e6105aa1d6546daa2424f57972fd2
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index b59f1554b4ad26d362c41c00b7a864a72efbd602..356817f909143518e97613c6bd56f11473799e0e 100644
+index 0b228b8bcae5ed2840ab244b6de35732f737504d..d2a282d9c84952627a0ae1a4b1ff388e39c472c3 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-@@ -411,12 +411,12 @@ public final class NaturalSpawner {
+@@ -415,12 +415,12 @@ public final class NaturalSpawner {
          return spawnGroup == MobCategory.MONSTER && world.getBlockState(pos.below()).is(Blocks.NETHER_BRICKS) && structureAccessor.getStructureAt(pos, false, StructureFeature.NETHER_BRIDGE).isValid() ? StructureFeature.NETHER_BRIDGE.getSpecialEnemies() : chunkGenerator.getMobsAt(biome != null ? biome : world.getBiome(pos), structureAccessor, spawnGroup, pos);
      }