Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@c919e94 Updated Upstream (Bukkit/CraftBukkit) (#8663)

gradle.properties

@@ -1,7 +1,7 @@
 group = org.purpurmc.purpur
 version = 1.19.3-R0.1-SNAPSHOT
 
-paperCommit = adb8e499dbc6050abf4a690d369cf506bc3ac318
+paperCommit = c919e944ffedf06a6a5625043bc744b06e499442
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/server/0006-Ridables.patch

@@ -66,7 +66,7 @@ index 740eff44b2895f83099beb4bc0e705f4252edc12..9918cc39247037c0a8379071167c5560
  
      public void doTick() {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d99baac236d7d4be09f351943971a9f60914be31..503323974eb4ee076636ef495d7c475d1ade00cd 100644
+index bc7cbee5b5a789aaf42ac770a488eae16fdc9d19..400f974549319a4b3b0445c815a2e99756a2bc36 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -720,7 +720,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -5180,10 +5180,10 @@ index 6cd6cb256bde958416a0e4b13fc1d3df74f230fd..3ac836bd6fccf66771dc0141b9b6a25d
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index ae59a1259db4c4cef6f0cd128850229a63491845..b53d824bc0f964349e70097285700e5facd3bcdf 100644
+index dd063e8b0df7505a96cd25dc5c797c0c04dfdfd0..7c2922c35f85be346a359d691a0c77c7c3a24726 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -544,6 +544,15 @@ public class CraftEventFactory {
+@@ -545,6 +545,15 @@ public class CraftEventFactory {
          // Paper end
          craftServer.getPluginManager().callEvent(event);
  
@@ -5199,7 +5199,7 @@ index ae59a1259db4c4cef6f0cd128850229a63491845..b53d824bc0f964349e70097285700e5f
          return event;
      }
  
-@@ -981,6 +990,7 @@ public class CraftEventFactory {
+@@ -982,6 +991,7 @@ public class CraftEventFactory {
                      damageCause = DamageCause.ENTITY_EXPLOSION;
                  }
                  event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), entity.getBukkitEntity(), damageCause, modifiers, modifierFunctions, source.isCritical()); // Paper - add critical damage API
@@ -5207,7 +5207,7 @@ index ae59a1259db4c4cef6f0cd128850229a63491845..b53d824bc0f964349e70097285700e5f
              }
              event.setCancelled(cancelled);
  
-@@ -1087,6 +1097,7 @@ public class CraftEventFactory {
+@@ -1088,6 +1098,7 @@ public class CraftEventFactory {
              } else {
                  entity.lastDamageCancelled = true; // SPIGOT-5339, SPIGOT-6252, SPIGOT-6777: Keep track if the event was canceled
              }
@@ -5215,7 +5215,7 @@ index ae59a1259db4c4cef6f0cd128850229a63491845..b53d824bc0f964349e70097285700e5f
              return event;
          }
  
-@@ -1146,6 +1157,7 @@ public class CraftEventFactory {
+@@ -1147,6 +1158,7 @@ public class CraftEventFactory {
          EntityDamageEvent event;
          if (damager != null) {
              event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), damagee.getBukkitEntity(), cause, modifiers, modifierFunctions, critical); // Paper - add critical damage API

patches/server/0134-Dont-run-with-scissors.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Dont run with scissors!
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 22c35d1e16bed3b9c16d776ffe1621c3fe21f58f..5c09d0bbe552af208cb0443699c20639d67db566 100644
+index 8178fea5507ad916a7b3344eaacc99c85c69b56c..b3eb63c530dacb2ff271d033f2e577c36b939c94 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1687,6 +1687,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -55,10 +55,10 @@ index f2ef4d93e070167d70f597e8893bf29b53433a28..f3a682fdc1c9ba24a9532c6c17ea3c4e
      private boolean bypassArmor;
      private boolean bypassInvul;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index b53d824bc0f964349e70097285700e5facd3bcdf..07ecccf5eddb0088e5409b3bb8a6b3c1883189d2 100644
+index 7c2922c35f85be346a359d691a0c77c7c3a24726..86c49b8d3b0059bba6a78a17d870aff4568b39e4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1132,6 +1132,10 @@ public class CraftEventFactory {
+@@ -1133,6 +1133,10 @@ public class CraftEventFactory {
              cause = DamageCause.FREEZE;
          } else if (source == DamageSource.GENERIC) {
              cause = DamageCause.CUSTOM;
@@ -70,7 +70,7 @@ index b53d824bc0f964349e70097285700e5facd3bcdf..07ecccf5eddb0088e5409b3bb8a6b3c1
  
          if (cause != null) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 0507a090fb9122fdda4111fbd2ad3c51e4ef5c36..0d40cd506342c006bddc769c57f11d34ccb00dc7 100644
+index 5b0625955e2a65f689c8a128d73170bc1f0c8025..c8097ec7887ac8e689b6843d9ff7744d6a453478 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -182,6 +182,7 @@ public class PurpurConfig {
@@ -95,7 +95,7 @@ index 0507a090fb9122fdda4111fbd2ad3c51e4ef5c36..0d40cd506342c006bddc769c57f11d34
  
      public static String serverModName = "Purpur";
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index ec110add6bd3ad89b9a542edfd7b2014930b2702..d6dc72598aa1481419ccdf176b67f3bb37437505 100644
+index 44dc44f0959c65ea4a856e39c3ca23270a9c4631..f0008bc35678c9894dbac62b4d083e89b290351b 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -200,6 +200,8 @@ public class PurpurWorldConfig {

patches/server/0264-Stonecutter-damage.patch

@@ -65,10 +65,10 @@ index 6fbac97beacd0f806301c34de4ca6495b5aa705e..365c3d01a59d117ee9f238b1c1ded645
              } else if (blockState.is(Blocks.HONEY_BLOCK)) {
                  return BlockPathTypes.STICKY_HONEY;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 07ecccf5eddb0088e5409b3bb8a6b3c1883189d2..8378c458b03bf0fe71dbc7452dce40f665f1ab10 100644
+index 86c49b8d3b0059bba6a78a17d870aff4568b39e4..2d49774f195c2f72004319b2e35763c7071969f1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1056,6 +1056,10 @@ public class CraftEventFactory {
+@@ -1057,6 +1057,10 @@ public class CraftEventFactory {
                  cause = DamageCause.MAGIC;
              } else if (source == DamageSource.IN_FIRE) {
                  cause = DamageCause.FIRE;