Updated Upstream (Paper & Purpur)

gradle.properties

@@ -1,7 +1,7 @@
 group = net.prismarineteam.prismarine
 version = 1.19.2-R0.1-SNAPSHOT
 
-paperCommit = 6d1409316e7723f0d99f1192d4c5f24d48ab5eed
+paperCommit = ec76e36a4e57cbb55903e02de38ba78fb73e4a0f
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/api/0001-Pufferfish-API-Changes.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <[email protected]>
-Date: Wed, 28 Sep 2022 16:59:12 +0900
+Date: Sun, 2 Oct 2022 11:24:40 +0900
 Subject: [PATCH] Pufferfish API Changes
 
 Copyright (C) 2022 Pufferfish Studios LLC

patches/api/0002-Purpur-API-Changes.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <[email protected]>
-Date: Wed, 28 Sep 2022 17:07:52 +0900
+Date: Sun, 2 Oct 2022 11:26:40 +0900
 Subject: [PATCH] Purpur API Changes
 
 Copyright (C) 2022 PurpurMC LLC

patches/server/0004-Fix-Purpur-patches.patch

@@ -125,10 +125,10 @@ index 5dab2eea9e9c50e41c7971daefc3bbe819583207..7d310183e7715aac4f442948ef210b47
 
      @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index c622cbe7104d0d107116d711de06b3653e3bfd1a..7a37bdc4a926bc7e8140331a98fe5e2a17b2ffaf 100644
+index df0668c1f35c1acca1de7f81c8afaa06c2e21082..6e4d83851f50c9c1c65726cc0cebdabb605f91a0 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1074,12 +1074,14 @@ public class PurpurWorldConfig {
+@@ -1040,12 +1040,14 @@ public class PurpurWorldConfig {
      public boolean allayRidableInWater = false;
      public boolean allayControllable = true;
      public List<String> allayRespectNBT = new ArrayList<>();
@@ -143,7 +143,7 @@ index c622cbe7104d0d107116d711de06b3653e3bfd1a..7a37bdc4a926bc7e8140331a98fe5e2a
      }
 
      public boolean axolotlRidable = false;
-@@ -1593,12 +1595,14 @@ public class PurpurWorldConfig {
+@@ -1559,12 +1561,14 @@ public class PurpurWorldConfig {
      public boolean frogControllable = true;
      public float frogRidableJumpHeight = 0.65F;
      public int frogBreedingTicks = 6000;
@@ -158,7 +158,7 @@ index c622cbe7104d0d107116d711de06b3653e3bfd1a..7a37bdc4a926bc7e8140331a98fe5e2a
      }
 
      public boolean ghastRidable = false;
-@@ -2644,10 +2648,12 @@ public class PurpurWorldConfig {
+@@ -2612,10 +2616,12 @@ public class PurpurWorldConfig {
      public boolean tadpoleRidable = false;
      public boolean tadpoleRidableInWater = false;
      public boolean tadpoleControllable = true;
@@ -171,7 +171,7 @@ index c622cbe7104d0d107116d711de06b3653e3bfd1a..7a37bdc4a926bc7e8140331a98fe5e2a
      }
 
      public boolean traderLlamaRidable = false;
-@@ -2858,10 +2864,12 @@ public class PurpurWorldConfig {
+@@ -2826,10 +2832,12 @@ public class PurpurWorldConfig {
      public boolean wardenRidable = false;
      public boolean wardenRidableInWater = false;
      public boolean wardenControllable = true;

patches/server/0005-Rebrand.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index e2ee97d7a98e6eac3db4f2a06eaa35f1dde45db1..762d7405ddb661ce2913dff6963e076767297a52 100644
+index a61a0f4f1ce89681336d2ed246e6b616aa6fe73d..bff4b5bb7543d8921d50cbc645aa0fe4dd3985bb 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -9,7 +9,7 @@ plugins {
@@ -17,7 +17,7 @@ index e2ee97d7a98e6eac3db4f2a06eaa35f1dde45db1..762d7405ddb661ce2913dff6963e0767
      // Pufferfish start
      implementation("io.papermc.paper:paper-mojangapi:1.19.2-R0.1-SNAPSHOT") {
          exclude("io.papermc.paper", "paper-api")
-@@ -87,7 +87,7 @@ tasks.jar {
+@@ -86,7 +86,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
@@ -255,10 +255,10 @@ index fb87620c742ff7912f5e8ccd2a7930dd605576d9..2d90a7cf5d5de95005724fabcf7362bf
          }
 
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index f45b0002efd30b45633b31cf9995cfcbdf0f7504..cf08075a2f38dd6809b872fa1ad6fc6f620cceba 100644
+index 14844cb8a402ac987f44a91b95d5ebdac73c6dfe..af628461958c4c0e630e70d09c80dd92e1b03556 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -239,7 +239,7 @@ public class PurpurConfig {
+@@ -244,7 +244,7 @@ public class PurpurConfig {
          if (!TimingsManager.hiddenConfigs.contains("settings.seed")) TimingsManager.hiddenConfigs.add("settings.seed");
      }
 

patches/server/0013-Miscellaneous-patches.patch

@@ -210,10 +210,10 @@ index 3eee2ebaee415cde427eb72f61a3c67ed5cc0e30..97115c2c5fdbea7f73b2eb81093dfae6
      }
 
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index cf08075a2f38dd6809b872fa1ad6fc6f620cceba..8f65dfb8d29632d44c2b0b118881fc83e52d9ba6 100644
+index af628461958c4c0e630e70d09c80dd92e1b03556..223dec38e73b57e9130287ec74bb1786df77eb92 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -46,7 +46,11 @@ public class PurpurConfig {
+@@ -49,7 +49,11 @@ public class PurpurConfig {
              + "join us in our Discord guild.\n"
              + "\n"
              + "Website: https://purpurmc.org \n"

patches/server/0020-Optimize-default-configs.patch

@@ -71,10 +71,10 @@ index 88900f7a2077049cc5d78fe17314dbdf57d64a08..71d6bc1a5dd6fc4c28fb81b8c02bda87
          this.broadcastRconToOps = this.get("broadcast-rcon-to-ops", true);
          this.broadcastConsoleToOps = this.get("broadcast-console-to-ops", true);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 8f65dfb8d29632d44c2b0b118881fc83e52d9ba6..0397e90c9a3c7a53f3cc9d4f404b5eb4a6338e1f 100644
+index 223dec38e73b57e9130287ec74bb1786df77eb92..400ec68e3cca48e6a048cec3caf439c722e51dd9 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -253,7 +253,7 @@ public class PurpurConfig {
+@@ -258,7 +258,7 @@ public class PurpurConfig {
          laggingThreshold = getDouble("settings.lagging-threshold", laggingThreshold);
      }
 
@@ -84,10 +84,10 @@ index 8f65dfb8d29632d44c2b0b118881fc83e52d9ba6..0397e90c9a3c7a53f3cc9d4f404b5eb4
          useAlternateKeepAlive = getBoolean("settings.use-alternate-keepalive", useAlternateKeepAlive);
      }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 7a37bdc4a926bc7e8140331a98fe5e2a17b2ffaf..6b223ab7ddf8208bfab1db925c33926ec9f2acaf 100644
+index 6e4d83851f50c9c1c65726cc0cebdabb605f91a0..cb3418654b1eede2de788b57852bd8a80dff2a94 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -414,7 +414,7 @@ public class PurpurWorldConfig {
+@@ -415,7 +415,7 @@ public class PurpurWorldConfig {
      public boolean playerInvulnerableWhileAcceptingResourcePack = false;
      public String playerDeathExpDropEquation = "expLevel * 7";
      public int playerDeathExpDropMax = 100;

patches/server/0026-Revert-Purpur-commit-disable-pufferfish-mechanical-c.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Revert Purpur commit "disable pufferfish mechanical changes
 
 
 diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
-index 7cda3da7f9eb68e06570765ef8e0fa0b92ffb1ab..86cdfabc754c55f68f6d8328e4a91473db254ddd 100644
+index c9ae76401278057f87ebef13619a114722e81a1d..e7266845645982dfbc7708e702ed39135ac5f732 100644
 --- a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
 +++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
-@@ -247,7 +247,7 @@ public class PufferfishConfig {
+@@ -239,7 +239,7 @@ public class PufferfishConfig {
      public static int activationDistanceMod;
 
      private static void dynamicActivationOfBrains() throws IOException {
@@ -18,7 +18,7 @@ index 7cda3da7f9eb68e06570765ef8e0fa0b92ffb1ab..86cdfabc754c55f68f6d8328e4a91473
          startDistance = getInt("dab.start-distance", "activation-range.start-distance", 12,
                  "This value determines how far away an entity has to be",
                  "from the player to start being effected by DEAR.");
-@@ -315,7 +315,7 @@ public class PufferfishConfig {
+@@ -283,7 +283,7 @@ public class PufferfishConfig {
 
      public static boolean throttleInactiveGoalSelectorTick;
  	private static void inactiveGoalSelectorThrottle() {