Update upstream

Author: Malfrador

gradle.properties

@@ -1,7 +1,7 @@
 group=de.erethon.papyrus
-version=1.21.7-R0.1-SNAPSHOT
-mcVersion=1.21.7
-paperRef=b4466ec981d104c4756d1a3b90c2ee0d6ce4e6bd
+version=1.21.8-R0.1-SNAPSHOT
+mcVersion=1.21.8
+paperRef=9aaaadffaa0caad086cf04709904b47eaac161d7
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true

papyrus-api/paper-patches/files/src/main/java/org/bukkit/entity/Damageable.java.patch

@@ -1,19 +1,12 @@
 --- a/src/main/java/org/bukkit/entity/Damageable.java
 +++ b/src/main/java/org/bukkit/entity/Damageable.java
-@@ -1,5 +_,6 @@
- package org.bukkit.entity;
- 
-+import de.erethon.papyrus.PDamageType;
- import org.bukkit.attribute.Attribute;
- import org.bukkit.damage.DamageSource;
- import org.jetbrains.annotations.ApiStatus;
-@@ -120,4 +_,9 @@
+@@ -118,4 +_,9 @@
       */
      @Deprecated(since = "1.11")
      void resetMaxHealth();
 +
 +    // Papyrus start
-+    void damage(double amount, PDamageType type);
-+    void damage(double amount, Entity source, PDamageType type);
++    void damage(double amount, de.erethon.papyrus.PDamageType type);
++    void damage(double amount, Entity source, de.erethon.papyrus.PDamageType type);
 +    // Papyrus end
  }

papyrus-server/build.gradle.kts.patch

@@ -48,15 +48,17 @@
      implementation("ca.spottedleaf:concurrentutil:0.0.3")
      implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
      implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21
-@@ -156,6 +_,7 @@
-     implementation("org.ow2.asm:asm-commons:9.8")
-     implementation("org.spongepowered:configurate-yaml:4.2.0-20250225.064233-199")
-     implementation("org.spongepowered:configurate-core:4.2.0-20250225.064233-204") // Pinned dependency of above pinned yaml snapshot.
-+    implementation("de.erethon:bedrock:1.5.17") // Papyrus - Bedrock
+@@ -186,6 +_,9 @@
+     // Spark
+     implementation("me.lucko:spark-api:0.1-20240720.200737-2")
+     implementation("me.lucko:spark-paper:1.10.133-20250413.112336-1")
++
++    // Erethon
++    implementation("de.erethon:bedrock:1.5.17")
+ }
 
-     // Deps that were previously in the API but have now been moved here for backwards compat, eventually to be removed
-     runtimeOnly("commons-lang:commons-lang:2.6")
-@@ -205,14 +_,14 @@
+ tasks.jar {
+@@ -200,14 +_,14 @@
          val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim()
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
@@ -76,7 +78,7 @@
              "Build-Number" to (build ?: ""),
              "Build-Time" to buildTime.toString(),
              "Git-Branch" to gitBranch,
-@@ -271,12 +_,7 @@
+@@ -266,12 +_,7 @@
      jvmArgumentProviders.add(provider)
  }
 

papyrus-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -1564,6 +_,11 @@
+@@ -1565,6 +_,11 @@
          // Paper start - Server Tick Events
          long endTime = System.nanoTime();
          long remaining = (TICK_TIME - (endTime - lastTick)) - catchupTime;

papyrus-server/minecraft-patches/sources/net/minecraft/world/entity/Mob.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/Mob.java
 +++ b/net/minecraft/world/entity/Mob.java
-@@ -1501,12 +_,26 @@
+@@ -1514,12 +_,26 @@
 
      @Override
      public boolean doHurtTarget(ServerLevel level, Entity source) {

run/server.properties

@@ -1,5 +1,5 @@
 #Minecraft server properties
-#Sun Jul 06 22:14:05 CEST 2025
+#Fri Sep 05 23:18:28 CEST 2025
 accepts-transfers=false
 allow-flight=false
 allow-nether=false