Updated Upstream (Leaf)

Author: Pascalpex

deepslateMC-server/minecraft-patches/sources/net/minecraft/world/damagesource/DamageSource.java.patch

@@ -1,11 +1,11 @@
 --- a/net/minecraft/world/damagesource/DamageSource.java
 +++ b/net/minecraft/world/damagesource/DamageSource.java
-@@ -89,7 +_,7 @@
+@@ -72,7 +_,7 @@
 
-     public DamageSource customEventDamager(Entity entity) {
+     public DamageSource eventEntityDamager(final Entity entity) {
          if (this.directEntity != null) {
--            throw new IllegalStateException("Cannot set custom event damager when direct entity is already set (report a bug to Paper, if you think this is a Leaf bug, please report it at https://github.com/Winds-Studio/Leaf/issues)"); // Gale - branding changes // Leaf - Rebrand
-+            throw new IllegalStateException("Cannot set custom event damager when direct entity is already set (report a bug to Paper, if you think this is a DeepslateMC bug, please report it at https://github.com/Pascalpex/DeepslateMC/issues )"); // Gale - branding changes // Leaf - Rebrand // Deepslate
+-            throw new IllegalStateException("Cannot set an event damager when a direct entity is already set (report a bug to Paper, if you think this is a Leaf bug, please report it at https://github.com/Winds-Studio/Leaf/issues)"); // Gale - branding changes // Leaf - Rebrand
++            throw new IllegalStateException("Cannot set an event damager when a direct entity is already set (report a bug to Paper, if you think this is a DeepslateMC bug, please report it at https://github.com/Pascalpex/DeepslateMC/issues)"); // Gale - branding changes // Leaf - Rebrand // Deepslate
          }
-         DamageSource damageSource = this.cloneInstance();
-         damageSource.customEventDamager = entity;
+         final DamageSource damageSource = this.copy();
+         damageSource.eventEntityDamager = entity;

deepslateMC-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1140,6 +_,7 @@
+@@ -1141,6 +_,7 @@
          org.galemc.gale.command.GaleCommands.registerCommands(this.console); // Gale - Gale commands - register commands
          this.spark.registerCommandBeforePlugins(this); // Paper - spark
          org.purpurmc.purpur.PurpurConfig.registerCommands(); // Purpur - Purpur config files

gradle.properties

@@ -2,7 +2,7 @@ group=de.pascalpex.deepslatemc
 version=1.21.4-R0.1-SNAPSHOT
 packageVersion = 1_21_R3
 mcVersion=1.21.4
-leafRef=541e5914ef8ef5d01d3d7f959fffdffb5526961c
+leafRef=d0f5bd99cb2769c67d4ceb502b59d04fcde85809
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true