From 37b9ad3bd71fd6b58f98c91d63c6d98e4c26e3d9 Mon Sep 17 00:00:00 2001
From: granny <granny@purpurmc.org>
Date: Tue, 30 Apr 2024 19:20:51 -0700
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@4ea67ab [ci skip] Remove trailing comma in projects action
PaperMC/Paper@8c058f8 Update paperweight to 1.6.3 (#10626)
PaperMC/Paper@fa6013d Fixes beds not exploding in the nether
PaperMC/Paper@3e0eb4a Updated Upstream (CraftBukkit) (#10624)
---
 .idea/runConfigurations/Run_Purpur_Paperclip_Jar.xml      | 2 +-
 build.gradle.kts                                          | 2 +-
 gradle.properties                                         | 2 +-
 patches/server/0065-Implement-bed-explosion-options.patch | 8 ++++----
 .../0066-Implement-respawn-anchor-explosion-options.patch | 6 +++---
 .../0262-Configurable-block-fall-damage-modifiers.patch   | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.idea/runConfigurations/Run_Purpur_Paperclip_Jar.xml b/.idea/runConfigurations/Run_Purpur_Paperclip_Jar.xml
index 737c94a7f..05a5aa732 100644
--- a/.idea/runConfigurations/Run_Purpur_Paperclip_Jar.xml
+++ b/.idea/runConfigurations/Run_Purpur_Paperclip_Jar.xml
@@ -5,7 +5,7 @@
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/run" />
     <option name="ALTERNATIVE_JRE_PATH" />
     <method v="2">
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="Upstream Paper [createReobfPaperclipJar]" run_configuration_type="GradleRunConfiguration" />
+      <option name="RunConfigurationTask" enabled="false" run_configuration_name="Upstream Paper [createMojmapPaperclipJar]" run_configuration_type="GradleRunConfiguration" />
     </method>
   </configuration>
 </component>
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index be3817628..1c342d750 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,7 +4,7 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
 plugins {
     java
     `maven-publish`
-    id("io.papermc.paperweight.patcher") version "1.6.2"
+    id("io.papermc.paperweight.patcher") version "1.6.3"
 }
 
 allprojects {
diff --git a/gradle.properties b/gradle.properties
index 9b92dea84..45b60007f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.20.6-R0.1-SNAPSHOT
 
 mcVersion = 1.20.6
-paperCommit = 937a67a65172aa7ed2efafd536bbf7cfab2e3489
+paperCommit = 3e0eb4a1baa5df5847f69982c78814bf9757cb97
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/server/0065-Implement-bed-explosion-options.patch b/patches/server/0065-Implement-bed-explosion-options.patch
index 94fa8a84f..bdfcce98a 100644
--- a/patches/server/0065-Implement-bed-explosion-options.patch
+++ b/patches/server/0065-Implement-bed-explosion-options.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement bed explosion options
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/BedBlock.java b/src/main/java/net/minecraft/world/level/block/BedBlock.java
-index f726c3839ab93cc81fee26bfeb821bead3533b5e..2590eee0ca6a35fad3351dd6112aa596107fbe8f 100644
+index 4459685d1fb655f93a523ae50b62d6b97785ed90..549e3dd09a91ddf319fe0c1ec09924cbb600c1b8 100644
 --- a/src/main/java/net/minecraft/world/level/block/BedBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/BedBlock.java
 @@ -104,7 +104,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
@@ -17,12 +17,12 @@ index f726c3839ab93cc81fee26bfeb821bead3533b5e..2590eee0ca6a35fad3351dd6112aa596
                  return InteractionResult.SUCCESS;
              } else if ((Boolean) state.getValue(BedBlock.OCCUPIED)) {
                  if (!BedBlock.canSetSpawn(world)) return this.explodeBed(state, world, pos); // Paper - check explode first
-@@ -156,7 +156,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
+@@ -157,7 +157,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
  
                  Vec3 vec3d = blockposition.getCenter();
  
--                world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, world, iblockdata, blockposition), (ExplosionDamageCalculator) null, vec3d, 5.0F, true, Level.ExplosionInteraction.BLOCK); // CraftBukkit - add state
-+                if (world.purpurConfig.bedExplode) world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, world, iblockdata, blockposition), (ExplosionDamageCalculator) null, vec3d, (float) world.purpurConfig.bedExplosionPower, world.purpurConfig.bedExplosionFire, world.purpurConfig.bedExplosionEffect); // CraftBukkit - add state // Purpur
+-                world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, world, iblockdata, blockposition, blockEntity), (ExplosionDamageCalculator) null, vec3d, 5.0F, true, Level.ExplosionInteraction.BLOCK); // CraftBukkit - add state // Paper - add BlockEntity
++                if (world.purpurConfig.bedExplode) world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, world, iblockdata, blockposition, blockEntity), (ExplosionDamageCalculator) null, vec3d, (float) world.purpurConfig.bedExplosionPower, world.purpurConfig.bedExplosionFire, world.purpurConfig.bedExplosionEffect); // CraftBukkit - add state // Paper - add BlockEntity // Purpur
                  return InteractionResult.SUCCESS;
              }
          }
diff --git a/patches/server/0066-Implement-respawn-anchor-explosion-options.patch b/patches/server/0066-Implement-respawn-anchor-explosion-options.patch
index 260009f57..c8af656e0 100644
--- a/patches/server/0066-Implement-respawn-anchor-explosion-options.patch
+++ b/patches/server/0066-Implement-respawn-anchor-explosion-options.patch
@@ -5,15 +5,15 @@ Subject: [PATCH] Implement respawn anchor explosion options
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java b/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
-index be85535767bc79875c38da78a209d33d4be87c8a..2b840a5516073da46207552688428d86fc99975b 100644
+index 0699211428f182d8d56a2ba019d89ce05c920430..351fb74d2cccd7f63c2efee197a2968f822eda42 100644
 --- a/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
 @@ -149,7 +149,7 @@ public class RespawnAnchorBlock extends Block {
          };
          Vec3 vec3d = explodedPos.getCenter();
  
--        world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, world, state, explodedPos), explosiondamagecalculator, vec3d, 5.0F, true, Level.ExplosionInteraction.BLOCK); // CraftBukkit - add state
-+        if (world.purpurConfig.respawnAnchorExplode)world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, world, state, explodedPos), explosiondamagecalculator, vec3d, (float) world.purpurConfig.respawnAnchorExplosionPower, world.purpurConfig.respawnAnchorExplosionFire, world.purpurConfig.respawnAnchorExplosionEffect);// CraftBukkit - add state // Purpur
+-        world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, world, state, explodedPos, null), explosiondamagecalculator, vec3d, 5.0F, true, Level.ExplosionInteraction.BLOCK); // CraftBukkit - add state // Paper
++        if (world.purpurConfig.respawnAnchorExplode) world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, world, state, explodedPos, null), explosiondamagecalculator, vec3d, (float) world.purpurConfig.respawnAnchorExplosionPower, world.purpurConfig.respawnAnchorExplosionFire, world.purpurConfig.respawnAnchorExplosionEffect); // CraftBukkit - add state // Paper // Purpur
      }
  
      public static boolean canSetSpawn(Level world) {
diff --git a/patches/server/0262-Configurable-block-fall-damage-modifiers.patch b/patches/server/0262-Configurable-block-fall-damage-modifiers.patch
index 489e026c7..a56fb6709 100644
--- a/patches/server/0262-Configurable-block-fall-damage-modifiers.patch
+++ b/patches/server/0262-Configurable-block-fall-damage-modifiers.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable block fall damage modifiers
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/BedBlock.java b/src/main/java/net/minecraft/world/level/block/BedBlock.java
-index 2590eee0ca6a35fad3351dd6112aa596107fbe8f..a4bae9631acfc363d22b89fb76965183d9dc79f1 100644
+index 549e3dd09a91ddf319fe0c1ec09924cbb600c1b8..a4a988ab1399702b943019e9c4e2cde3652b4e85 100644
 --- a/src/main/java/net/minecraft/world/level/block/BedBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/BedBlock.java
-@@ -180,7 +180,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
+@@ -181,7 +181,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
  
      @Override
      public void fallOn(Level world, BlockState state, BlockPos pos, Entity entity, float fallDistance) {