Merge branch 'ver/1.19.4' into JustDoom/ver/1.19.4

Author: granny

build.gradle.kts

@@ -1,3 +1,6 @@
+import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+import org.gradle.api.tasks.testing.logging.TestLogEvent
+
 plugins {
     java
     `maven-publish`
@@ -29,6 +32,13 @@ subprojects {
     tasks.withType<ProcessResources> {
         filteringCharset = Charsets.UTF_8.name()
     }
+    tasks.withType<Test> {
+        testLogging {
+            showStackTraces = true
+            exceptionFormat = TestExceptionFormat.FULL
+            events(TestLogEvent.STANDARD_OUT)
+        }
+    }
 
     repositories {
         mavenCentral()
@@ -49,7 +59,7 @@ repositories {
 dependencies {
     remapper("net.fabricmc:tiny-remapper:0.8.6:fat")
     decompiler("net.minecraftforge:forgeflower:2.0.627.2")
-    paperclip("io.papermc:paperclip:3.0.2")
+    paperclip("io.papermc:paperclip:3.0.3")
 }
 
 paperweight {

gradle.properties

@@ -1,7 +1,7 @@
 group = org.purpurmc.purpur
 version = 1.19.4-R0.1-SNAPSHOT
 
-paperCommit = 055f7228f05a11f6117b57ebebce4e7aac1f4e7f
+paperCommit = e8b82590d0c3dd57ac1728b236117d2fcd531c4f
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/api/0037-Potion-NamespacedKey.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Potion NamespacedKey
 
 
 diff --git a/src/main/java/org/bukkit/potion/PotionEffect.java b/src/main/java/org/bukkit/potion/PotionEffect.java
-index 24e36cdf580da885ac64002673a786b9c5a3f787..d20cc4d4f5b37a3de9cb3cf47af7a908e9dbc2fc 100644
+index ccdca0d75868135dc7b96daeff2236b225c4add1..cad9f4ddc6be23c595e79419872f8f026703cb80 100644
 --- a/src/main/java/org/bukkit/potion/PotionEffect.java
 +++ b/src/main/java/org/bukkit/potion/PotionEffect.java
 @@ -5,6 +5,7 @@ import com.google.common.collect.ImmutableMap;
@@ -16,7 +16,7 @@ index 24e36cdf580da885ac64002673a786b9c5a3f787..d20cc4d4f5b37a3de9cb3cf47af7a908
  import org.bukkit.configuration.serialization.ConfigurationSerializable;
  import org.bukkit.configuration.serialization.SerializableAs;
  import org.bukkit.entity.LivingEntity;
-@@ -26,12 +27,14 @@ public class PotionEffect implements ConfigurationSerializable {
+@@ -31,12 +32,14 @@ public class PotionEffect implements ConfigurationSerializable {
      private static final String AMBIENT = "ambient";
      private static final String PARTICLES = "has-particles";
      private static final String ICON = "has-icon";
@@ -31,7 +31,7 @@ index 24e36cdf580da885ac64002673a786b9c5a3f787..d20cc4d4f5b37a3de9cb3cf47af7a908
 
      /**
       * Creates a potion effect.
-@@ -44,6 +47,36 @@ public class PotionEffect implements ConfigurationSerializable {
+@@ -49,6 +52,36 @@ public class PotionEffect implements ConfigurationSerializable {
       * @param icon the icon status, see {@link PotionEffect#hasIcon()}
       */
      public PotionEffect(@NotNull PotionEffectType type, int duration, int amplifier, boolean ambient, boolean particles, boolean icon) {
@@ -68,15 +68,15 @@ index 24e36cdf580da885ac64002673a786b9c5a3f787..d20cc4d4f5b37a3de9cb3cf47af7a908
          Preconditions.checkArgument(type != null, "effect type cannot be null");
          this.type = type;
          this.duration = duration;
-@@ -51,6 +84,7 @@ public class PotionEffect implements ConfigurationSerializable {
+@@ -56,6 +89,7 @@ public class PotionEffect implements ConfigurationSerializable {
          this.ambient = ambient;
          this.particles = particles;
          this.icon = icon;
 +        this.key = key; // Purpur - add key
      }
 
      /**
-@@ -98,36 +132,43 @@ public class PotionEffect implements ConfigurationSerializable {
+@@ -103,36 +137,43 @@ public class PotionEffect implements ConfigurationSerializable {
       * @param map the map to deserialize from
       */
      public PotionEffect(@NotNull Map<String, Object> map) {
@@ -127,7 +127,7 @@ index 24e36cdf580da885ac64002673a786b9c5a3f787..d20cc4d4f5b37a3de9cb3cf47af7a908
      @NotNull
      private static PotionEffectType getEffectType(@NotNull Map<?, ?> map) {
          int type = getInt(map, TYPE);
-@@ -154,17 +195,33 @@ public class PotionEffect implements ConfigurationSerializable {
+@@ -159,17 +200,33 @@ public class PotionEffect implements ConfigurationSerializable {
          return def;
      }
 
@@ -169,7 +169,7 @@ index 24e36cdf580da885ac64002673a786b9c5a3f787..d20cc4d4f5b37a3de9cb3cf47af7a908
      }
 
      /**
-@@ -188,7 +245,7 @@ public class PotionEffect implements ConfigurationSerializable {
+@@ -193,7 +250,7 @@ public class PotionEffect implements ConfigurationSerializable {
              return false;
          }
          PotionEffect that = (PotionEffect) obj;
@@ -178,7 +178,7 @@ index 24e36cdf580da885ac64002673a786b9c5a3f787..d20cc4d4f5b37a3de9cb3cf47af7a908
      }
 
      /**
-@@ -256,6 +313,24 @@ public class PotionEffect implements ConfigurationSerializable {
+@@ -289,6 +346,24 @@ public class PotionEffect implements ConfigurationSerializable {
          return icon;
      }
 
@@ -203,7 +203,7 @@ index 24e36cdf580da885ac64002673a786b9c5a3f787..d20cc4d4f5b37a3de9cb3cf47af7a908
      @Override
      public int hashCode() {
          int hash = 1;
-@@ -270,6 +345,6 @@ public class PotionEffect implements ConfigurationSerializable {
+@@ -303,6 +378,6 @@ public class PotionEffect implements ConfigurationSerializable {
 
      @Override
      public String toString() {

patches/server/0006-Ridables.patch

@@ -22,7 +22,7 @@ index b37e0ff164a894d2033fb94bbbc2f630a0e66bcd..ac335ec4f70830c7687ac4e0aa2a6cba
          super(x, y, z);
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ac0693f439f063d19ea68d8b216d4ecf10441b15..9fb7e742b91311bf542f533e2a411e9847be7038 100644
+index 4cd9c56b3aea40996e249db163ffed0625d99b16..a5ed221909bd267711fdfb29c4557220c0998b4b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1526,6 +1526,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -191,7 +191,7 @@ index c1e9b40a4a0f9cdc650caa88b5ea132e06ee2496..7b1ca8fd2908b8a02ec2cd1966a31e06
      protected ParticleOptions getInkParticle() {
          return ParticleTypes.GLOW_SQUID_INK;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index e9d3e34520b706627205e0d5b17b25e09f198e7e..ff1bccf8c6a3b9adda11981b5d59bdfa82c1367a 100644
+index dcfb71b5a53df789e366fea2080921d677549a2e..e8798de526e2836308eca8e5f4a4388aa7e9d3c0 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -217,9 +217,9 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -5151,7 +5151,7 @@ index 57a0dbb23a32123d30c3b3572f4d129be9d97847..fa6938626c64ed17a2f56739d5801494
 +    // 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 7131cdb839df47bf3d2c2bf8476fd7a2ecebb3ba..e973f48e21a3c4544683806421a3316ac4991efa 100644
+index cdb8ec04f4a19ec3dbedbd5b17a7d1f3afaa238e..16261aa799c34d7134f4c1489e2ab0a5db7992f0 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 {
@@ -5178,15 +5178,15 @@ index 7131cdb839df47bf3d2c2bf8476fd7a2ecebb3ba..e973f48e21a3c4544683806421a3316a
              }
              event.setCancelled(cancelled);
 
-@@ -1087,6 +1097,7 @@ public class CraftEventFactory {
+@@ -1090,6 +1100,7 @@ public class CraftEventFactory {
              } else {
                  entity.lastDamageCancelled = true; // SPIGOT-5339, SPIGOT-6252, SPIGOT-6777: Keep track if the event was canceled
              }
 +            damager.getHandle().processClick(InteractionHand.MAIN_HAND); // Purpur
              return event;
          }
 
-@@ -1146,6 +1157,7 @@ public class CraftEventFactory {
+@@ -1149,6 +1160,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/0264-Spark-Profiler.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Spark Profiler
 Co-authored-by: granny <granny@purpurmc.org>
 
 diff --git a/src/main/java/io/papermc/paper/plugin/PluginInitializerManager.java b/src/main/java/io/papermc/paper/plugin/PluginInitializerManager.java
-index f7e43c693140b7a820b2432db312df8f7b099d4d..7ca119409eaab2052920e8d425bfde87a8ffc205 100644
+index 89bf48fd581ee6580b91e2eb31dd532cb622df5e..e35da199be67e04c34df6bc09afd8d8122cb0487 100644
 --- a/src/main/java/io/papermc/paper/plugin/PluginInitializerManager.java
 +++ b/src/main/java/io/papermc/paper/plugin/PluginInitializerManager.java
 @@ -102,6 +102,7 @@ public class PluginInitializerManager {
@@ -19,7 +19,7 @@ index f7e43c693140b7a820b2432db312df8f7b099d4d..7ca119409eaab2052920e8d425bfde87
      // This will be the end of me...
 diff --git a/src/main/java/io/papermc/paper/plugin/provider/source/SparkProviderSource.java b/src/main/java/io/papermc/paper/plugin/provider/source/SparkProviderSource.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..74e3334ec92e3864b84e299b33ca995224eb7c3f
+index 0000000000000000000000000000000000000000..2d6fa262a7f1a298069e74266cb62fed0136833c
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/plugin/provider/source/SparkProviderSource.java
 @@ -0,0 +1,82 @@
@@ -47,7 +47,7 @@ index 0000000000000000000000000000000000000000..74e3334ec92e3864b84e299b33ca9952
 +public class SparkProviderSource extends FileProviderSource {
 +    public static final SparkProviderSource INSTANCE = new SparkProviderSource();
 +
-+    private static final Logger LOGGER = LogUtils.getLogger();
++    private static final Logger LOGGER = LogUtils.getClassLogger();
 +
 +    public SparkProviderSource() {
 +        super("File '%s' specified by Purpur"::formatted);