From d0e4b7ba9eec658c92bc1ace07dafaea55805a55 Mon Sep 17 00:00:00 2001
From: granny <granny@purpurmc.org>
Date: Fri, 16 Feb 2024 02:07:20 -0800
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@37df121 Fix BlockState being set to null for damage events (#10252)
---
 gradle.properties                                           | 2 +-
 patches/server/0007-Component-related-conveniences.patch    | 4 ++--
 patches/server/0132-Dont-run-with-scissors.patch            | 4 ++--
 patches/server/0251-Stonecutter-damage.patch                | 6 +++---
 ...d-option-for-always-showing-item-in-player-death-m.patch | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index d976de2be..7b45e30fb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.20.4-R0.1-SNAPSHOT
 
 mcVersion = 1.20.4
-paperCommit = 31699ae9a8f3a57491e9c9276cffa5a51e9a5f60
+paperCommit = 37df12143c4f19eb6017619b7e7abeb0f848598a
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/server/0007-Component-related-conveniences.patch b/patches/server/0007-Component-related-conveniences.patch
index d2d04d7a8..2078c8fb7 100644
--- a/patches/server/0007-Component-related-conveniences.patch
+++ b/patches/server/0007-Component-related-conveniences.patch
@@ -61,10 +61,10 @@ index 91feb12732564c90656da487664dbc12e55397fc..a2e76fb8431cd4dc0cbf94245086c939
          Iterator iterator = this.players.iterator();
  
 diff --git a/src/main/java/net/minecraft/world/damagesource/DamageSource.java b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
-index fe9b45bfc3d000956f6de5594bf5732fa0e6bb08..6f1b9cd34a714c02e9800ff2972aa24ad4080842 100644
+index 1561b85a45f52a8162f43553f8485bfe084b8f1f..938524dc5b495ad160b9b14219db573e4e7c6a8a 100644
 --- a/src/main/java/net/minecraft/world/damagesource/DamageSource.java
 +++ b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
-@@ -169,6 +169,15 @@ public class DamageSource {
+@@ -170,6 +170,15 @@ public class DamageSource {
          }
      }
  
diff --git a/patches/server/0132-Dont-run-with-scissors.patch b/patches/server/0132-Dont-run-with-scissors.patch
index d0cdada7c..bd278a77e 100644
--- a/patches/server/0132-Dont-run-with-scissors.patch
+++ b/patches/server/0132-Dont-run-with-scissors.patch
@@ -53,7 +53,7 @@ index 9c99b2e365aacb8309f29acb9025faccd2c676b3..5c9d49b40a940df724101bef339a9ac5
              }
          }
 diff --git a/src/main/java/net/minecraft/world/damagesource/DamageSource.java b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
-index 6f1b9cd34a714c02e9800ff2972aa24ad4080842..2e443b02108b63fbaea2754b989e241494510363 100644
+index 938524dc5b495ad160b9b14219db573e4e7c6a8a..f7786be77a0594fa5e11a328648cbad16bbab2e1 100644
 --- a/src/main/java/net/minecraft/world/damagesource/DamageSource.java
 +++ b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
 @@ -27,6 +27,7 @@ public class DamageSource {
@@ -82,7 +82,7 @@ index 6f1b9cd34a714c02e9800ff2972aa24ad4080842..2e443b02108b63fbaea2754b989e2414
      public Entity getCausingEntity() {
          return (this.customCausingEntity != null) ? this.customCausingEntity : this.causingEntity;
      }
-@@ -93,6 +105,7 @@ public class DamageSource {
+@@ -94,6 +106,7 @@ public class DamageSource {
          damageSource.withSweep = this.isSweep();
          damageSource.poison = this.isPoison();
          damageSource.melting = this.isMelting();
diff --git a/patches/server/0251-Stonecutter-damage.patch b/patches/server/0251-Stonecutter-damage.patch
index 888103a8e..18cbb8337 100644
--- a/patches/server/0251-Stonecutter-damage.patch
+++ b/patches/server/0251-Stonecutter-damage.patch
@@ -18,7 +18,7 @@ index 5c9d49b40a940df724101bef339a9ac5a31fd025..8ed6b8ddc76bda3d4f298b3076dba927
                  // Purpur end
                  return damageSource.getLocalizedDeathMessage(this.mob);
 diff --git a/src/main/java/net/minecraft/world/damagesource/DamageSource.java b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
-index 2e443b02108b63fbaea2754b989e241494510363..09aa1677ad67701d592c18078eee5bd0317ba7c4 100644
+index f7786be77a0594fa5e11a328648cbad16bbab2e1..6736093629bf92a888b0c971f3cf0a4e725cddec 100644
 --- a/src/main/java/net/minecraft/world/damagesource/DamageSource.java
 +++ b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
 @@ -28,6 +28,7 @@ public class DamageSource {
@@ -45,7 +45,7 @@ index 2e443b02108b63fbaea2754b989e241494510363..09aa1677ad67701d592c18078eee5bd0
      // Purpur end
  
      public Entity getCausingEntity() {
-@@ -106,6 +116,7 @@ public class DamageSource {
+@@ -107,6 +117,7 @@ public class DamageSource {
          damageSource.poison = this.isPoison();
          damageSource.melting = this.isMelting();
          damageSource.scissors = this.isScissors(); // Purpur
@@ -124,7 +124,7 @@ index 0dc05919dfbbf73230505fcdc25d949b1602801c..996bd26e95e766ce4ca7e61d060881fe
                      return BlockPathTypes.STICKY_HONEY;
                  } else if (blockState.is(Blocks.COCOA)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index aa89fcab22c7ad0c9425f5ae65cc2c6b150579cc..069ea4dc556d179d166e1dba3527c9def7129e65 100644
+index 2d47fd8290c9712bbf720452f5ffe134b1941d8c..b30d0d4d453252d1f5774f5155fb1ab61294d6be 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1133,7 +1133,7 @@ public class CraftEventFactory {
diff --git a/patches/server/0302-Add-option-for-always-showing-item-in-player-death-m.patch b/patches/server/0302-Add-option-for-always-showing-item-in-player-death-m.patch
index e9ab9b13e..e13956348 100644
--- a/patches/server/0302-Add-option-for-always-showing-item-in-player-death-m.patch
+++ b/patches/server/0302-Add-option-for-always-showing-item-in-player-death-m.patch
@@ -18,10 +18,10 @@ index 8ed6b8ddc76bda3d4f298b3076dba9275cec93d9..1653d154edb38a6450ee51cb5e5b8e3d
  
      private Component getFallMessage(CombatEntry damageRecord, @Nullable Entity attacker) {
 diff --git a/src/main/java/net/minecraft/world/damagesource/DamageSource.java b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
-index 09aa1677ad67701d592c18078eee5bd0317ba7c4..4b920672dbd7d9baf15191caa8892359d378f3e7 100644
+index 6736093629bf92a888b0c971f3cf0a4e725cddec..ba4466c49a7c1713007140efdc2eb805e2516b4c 100644
 --- a/src/main/java/net/minecraft/world/damagesource/DamageSource.java
 +++ b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
-@@ -189,7 +189,7 @@ public class DamageSource {
+@@ -190,7 +190,7 @@ public class DamageSource {
  
              ItemStack itemstack1 = itemstack;