Updated Upstream (Paper)

build.gradle.kts

@@ -19,8 +19,8 @@ repositories {
 }
 
 dependencies {
-    remapper("net.fabricmc:tiny-remapper:0.8.2:fat")
-    decompiler("net.minecraftforge:forgeflower:1.5.605.7")
+    remapper("net.fabricmc:tiny-remapper:0.8.6:fat")
+    decompiler("net.minecraftforge:forgeflower:1.5.605.10")
     paperclip("io.papermc:paperclip:3.0.2")
 }
 

gradle.properties

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

patches/server/0001-Pufferfish-Server-Changes.patch

@@ -21,10 +21,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 44e0f265432487fe5c3c00c5245041298ade16a0..f0d22a733e3b97fb959cd566fb6c93c6d5681e16 100644
+index b0e4f11e8af4b909a56bb5576d05ef0537fb25f7..5b43f5c27ce903c53cbce245477fbdefdc88733f 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -9,8 +9,12 @@ plugins {
+@@ -7,8 +7,12 @@ plugins {
  }
 
  dependencies {
@@ -39,7 +39,7 @@ index 44e0f265432487fe5c3c00c5245041298ade16a0..f0d22a733e3b97fb959cd566fb6c93c6
      // Paper start
      implementation("org.jline:jline-terminal-jansi:3.21.0")
      implementation("net.minecrell:terminalconsoleappender:1.3.0")
-@@ -44,6 +48,14 @@ dependencies {
+@@ -42,6 +46,14 @@ dependencies {
      runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
      runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
 
@@ -54,7 +54,7 @@ index 44e0f265432487fe5c3c00c5245041298ade16a0..f0d22a733e3b97fb959cd566fb6c93c6
      testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
      testImplementation("junit:junit:4.13.2")
      testImplementation("org.hamcrest:hamcrest-library:1.3")
-@@ -52,6 +64,14 @@ dependencies {
+@@ -50,6 +62,14 @@ dependencies {
  }
 
  val craftbukkitPackageVersion = "1_19_R1" // Paper
@@ -69,7 +69,7 @@ index 44e0f265432487fe5c3c00c5245041298ade16a0..f0d22a733e3b97fb959cd566fb6c93c6
  tasks.jar {
      archiveClassifier.set("dev")
 
-@@ -64,7 +84,7 @@ tasks.jar {
+@@ -62,7 +82,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
@@ -2607,7 +2607,7 @@ index 540bc9500c35c0db719b00aa26f6fb3a1b08ed9f..806cb760822a99316b08ad95ff8922df
      int LARGE_MAX_STACK_SIZE = 64;
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f2908cf61ff28bef44fcf46b15cf585e942fd7ce..23ef9124bada519ab5ea3869b97d96679ad8f689 100644
+index 6fa47becd0f83ac4273ef3a10c314aa27b08184b..26b42474a94ccabd8cfcca39e4c37fb14852cbb8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -291,7 +291,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2692,7 +2692,7 @@ index f2908cf61ff28bef44fcf46b15cf585e942fd7ce..23ef9124bada519ab5ea3869b97d9667
          this.level.getProfiler().push("entityBaseTick");
          if (firstTick && this instanceof net.minecraft.world.entity.NeutralMob neutralMob) neutralMob.tickInitialPersistentAnger(level); // Paper - Update last hurt when ticking
          this.feetBlockState = null;
-@@ -4015,16 +4048,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4019,16 +4052,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
 
      public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
@@ -2718,7 +2718,7 @@ index f2908cf61ff28bef44fcf46b15cf585e942fd7ce..23ef9124bada519ab5ea3869b97d9667
              double d1 = 0.0D;
              boolean flag = this.isPushedByFluid();
              boolean flag1 = false;
-@@ -4032,14 +4067,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4036,14 +4071,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              int k1 = 0;
              BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
 
@@ -2786,7 +2786,7 @@ index f2908cf61ff28bef44fcf46b15cf585e942fd7ce..23ef9124bada519ab5ea3869b97d9667
 
                              if (d2 >= axisalignedbb.minY) {
                                  flag1 = true;
-@@ -4061,9 +4143,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4065,9 +4147,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                                  // CraftBukkit end
                              }
                          }

patches/server/0002-Purpur-Server-Changes.patch

@@ -20,10 +20,10 @@ copies or substantial portions of the Software.
 THE SOFTWARE IS PROVIDED AS
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index f0d22a733e3b97fb959cd566fb6c93c6d5681e16..fd4a23b4b9fc9143f88c907e406476508ff62f99 100644
+index 5b43f5c27ce903c53cbce245477fbdefdc88733f..40e47799426ba0180c15204241d7687071908543 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -9,7 +9,7 @@ plugins {
+@@ -7,7 +7,7 @@ plugins {
  }
 
  dependencies {
@@ -32,7 +32,7 @@ index f0d22a733e3b97fb959cd566fb6c93c6d5681e16..fd4a23b4b9fc9143f88c907e40647650
      // Pufferfish start
      implementation("io.papermc.paper:paper-mojangapi:1.19.2-R0.1-SNAPSHOT") {
          exclude("io.papermc.paper", "paper-api")
-@@ -44,6 +44,9 @@ dependencies {
+@@ -42,6 +42,9 @@ dependencies {
      runtimeOnly("mysql:mysql-connector-java:8.0.29")
      runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
 
@@ -42,7 +42,7 @@ index f0d22a733e3b97fb959cd566fb6c93c6d5681e16..fd4a23b4b9fc9143f88c907e40647650
      runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5")
      runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
      runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
-@@ -84,7 +87,7 @@ tasks.jar {
+@@ -82,7 +85,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
@@ -51,7 +51,7 @@ index f0d22a733e3b97fb959cd566fb6c93c6d5681e16..fd4a23b4b9fc9143f88c907e40647650
              "Implementation-Vendor" to date, // Paper
              "Specification-Title" to "Bukkit",
              "Specification-Version" to project.version,
-@@ -183,7 +186,7 @@ fun TaskContainer.registerRunTask(
+@@ -154,7 +157,7 @@ fun TaskContainer.registerRunTask(
      name: String,
      block: JavaExec.() -> Unit
  ): TaskProvider<JavaExec> = register<JavaExec>(name) {
@@ -3879,7 +3879,7 @@ index f5c9be3fde2654bd5a6b3ee737afe96a9393e836..64571396652d4447ce3665cd8cef668c
 
      public void setNoCounter(boolean permanent) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 23ef9124bada519ab5ea3869b97d96679ad8f689..967647c7dc0a4c2d762e7133fe969106f7d8ecba 100644
+index 26b42474a94ccabd8cfcca39e4c37fb14852cbb8..385850b7a2802b4315a33aa2972a9a44127f8987 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -155,7 +155,7 @@ import org.bukkit.plugin.PluginManager;
@@ -4131,7 +4131,7 @@ index 23ef9124bada519ab5ea3869b97d96679ad8f689..967647c7dc0a4c2d762e7133fe969106
      }
 
      public int getAirSupply() {
-@@ -3370,14 +3399,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3374,14 +3403,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          }
          // Paper end
          if (this.level instanceof ServerLevel && !this.isRemoved()) {
@@ -4148,7 +4148,7 @@ index 23ef9124bada519ab5ea3869b97d96679ad8f689..967647c7dc0a4c2d762e7133fe969106
              PortalInfo shapedetectorshape = (location == null) ? this.findDimensionEntryPoint(worldserver) : new PortalInfo(new Vec3(location.x(), location.y(), location.z()), Vec3.ZERO, this.yRot, this.xRot, worldserver, null); // CraftBukkit
 
              if (shapedetectorshape == null) {
-@@ -3411,7 +3440,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3415,7 +3444,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  this.unRide();
                  // CraftBukkit end
 
@@ -4157,7 +4157,7 @@ index 23ef9124bada519ab5ea3869b97d96679ad8f689..967647c7dc0a4c2d762e7133fe969106
                  // Paper start - Change lead drop timing to prevent dupe
                  if (this instanceof Mob) {
                      ((Mob) this).dropLeash(true, true); // Paper drop lead
-@@ -3434,10 +3463,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3438,10 +3467,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  }
 
                  this.removeAfterChangingDimensions();
@@ -4170,7 +4170,7 @@ index 23ef9124bada519ab5ea3869b97d96679ad8f689..967647c7dc0a4c2d762e7133fe969106
                  return entity;
              }
          } else {
-@@ -3550,7 +3579,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3554,7 +3583,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
 
      public boolean canChangeDimensions() {
@@ -4179,7 +4179,7 @@ index 23ef9124bada519ab5ea3869b97d96679ad8f689..967647c7dc0a4c2d762e7133fe969106
      }
 
      public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) {
-@@ -3797,6 +3826,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3801,6 +3830,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return SlotAccess.NULL;
      }
 
@@ -4200,7 +4200,7 @@ index 23ef9124bada519ab5ea3869b97d96679ad8f689..967647c7dc0a4c2d762e7133fe969106
      @Override
      public void sendSystemMessage(Component message) {}
 
-@@ -4047,6 +4090,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4051,6 +4094,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          this.yRotO = this.getYRot();
      }
 
@@ -4213,7 +4213,7 @@ index 23ef9124bada519ab5ea3869b97d96679ad8f689..967647c7dc0a4c2d762e7133fe969106
      public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
          if (false && this.touchingUnloadedChunk()) { // Pufferfish - cost of a lookup here is the same cost as below, so skip
              return false;
-@@ -4553,4 +4602,64 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4557,4 +4606,64 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return ((net.minecraft.server.level.ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
      }
      // Paper end
@@ -20037,7 +20037,7 @@ index 85d94f47792bbd63c4c4ee8fa4a88abc4c440286..2491785f5edd782b74189bef33eeffe1
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 81ab184cb5235913ef43ae4d7f1ac82bce927519..fbab5e57565b8f9bc071d02933447f749a6bf5e3 100644
+index 55d83a9a691d11c9408d2c3260c3e77dfb51b97e..41fafd4a1583e748d763439e8838739ec1ff8e1d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2234,6 +2234,48 @@ public class CraftWorld extends CraftRegionAccessor implements World {

patches/server/0005-Rebrand.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Rebrand
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index fd4a23b4b9fc9143f88c907e406476508ff62f99..f11cae89edeb929c37de00a0f237711f33914301 100644
+index 40e47799426ba0180c15204241d7687071908543..16f927eef66a32b644361569f0567c5418400e06 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -9,7 +9,7 @@ plugins {
+@@ -7,7 +7,7 @@ plugins {
  }
 
  dependencies {
@@ -17,7 +17,7 @@ index fd4a23b4b9fc9143f88c907e406476508ff62f99..f11cae89edeb929c37de00a0f237711f
      // 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 {
+@@ -85,7 +85,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
@@ -155,7 +155,7 @@ index b5b6657e52e4f7a630229bd3ba433438af293e22..e52235ae17bddc768b291a45eb449215
          stringbuilder.append("// ");
          stringbuilder.append(CrashReport.getErrorComment());
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a2b3875dfb70011e0df517813590a96fff28f662..0b9fa8ae706d84b2445115e310c089e5dbac8a4a 100644
+index f7065a325fa9ecba067c9f7dbf6ed138a5c16808..1a8dffe6b975e1ac3b4db98bf8a6b36b687e4ae0 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -926,7 +926,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -168,7 +168,7 @@ index a2b3875dfb70011e0df517813590a96fff28f662..0b9fa8ae706d84b2445115e310c089e5
                  this.getRunningThread().stop();
                  try {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index cf8693d02de53f1e02d55936f889c5724889e3f5..a062b2cf93a047551312e00bc2dc75650270d88c 100644
+index 0bb14272d024af90e7aef40f2f694e184af607d3..5cc70f63644fa4e3ca683b1311065fe44295e638 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1013,7 +1013,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -194,7 +194,7 @@ index 3aa9a667d988fe2b6118ce4b3a4551e7e17b7884..dfe2a2c13b149c20728112d4e9dfcfa8
 
      private static final int DEFAULT_SIZE_THRESHOLD = 1024 * 8;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 461d15bd2be988aa9e2379299181b3b37e81749a..36cc2cb5fdebcc051feae7490522c526f8ae9585 100644
+index e69f3dc44f4f372d39f49b50efc1bf8d8d54779b..6e0e3fbe30b6b309862c1034b5ca7e75ddc5b507 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -249,7 +249,7 @@ import javax.annotation.Nullable; // Paper
@@ -207,7 +207,7 @@ index 461d15bd2be988aa9e2379299181b3b37e81749a..36cc2cb5fdebcc051feae7490522c526
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 37bcc72ce132f7901460f25d700dba1bac6c210f..37cc1388b3cf6a49832c8504875aa04d318638b4 100644
+index 9e192788af0b2ae5479c2fae1239b10e1ff45351..23721e9469c076f012859133e038dfabdf1392c1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -866,7 +866,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -255,7 +255,7 @@ index fb87620c742ff7912f5e8ccd2a7930dd605576d9..2d90a7cf5d5de95005724fabcf7362bf
          }
 
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 3cfbb4300e82cce409a7a0b53ef98987f166143c..4aed2a7e4400daaee234f928255aee5902eb7f3e 100644
+index ccca392a45cb05abb55ddd5c6c36e6f9c7a5d171..0797dbf646550aa34b2b5d3fe9ab676740dfaf44 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -244,7 +244,7 @@ public class PurpurConfig {

patches/server/0028-Force-despawn-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Force despawn API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 60501b55aa4e24cd57edab24d25da247cc02d376..1a111ff8cfdfe119f619a3145705bdafa86aa960 100644
+index 62fea824f1839bf9ec00cb695d0d81c18eb56a07..316c023a9184937e017412ed4f20b9bd025c956e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4428,6 +4428,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4432,6 +4432,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
 
      public void checkDespawn() {}