Updated Upstream (Paper & Purpur)

gradle.properties

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

patches/api/0005-Miscellaneous-patches.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Miscellaneous patches
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index da7ee9a8748737a2041c3a5aa6e69de48e77485c..f6139369e1a357c081bb91b9e5dbe8bcae2ba38e 100644
+index 8e64ccdb928bc38cb703e60c8ec31339a6f6d894..dd8c91f73988a9ed972efbd33349de0d29bd6884 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -25,7 +25,7 @@ dependencies {
@@ -14,7 +14,7 @@ index da7ee9a8748737a2041c3a5aa6e69de48e77485c..f6139369e1a357c081bb91b9e5dbe8bc
      api("com.google.code.gson:gson:2.8.9")
 -    api("net.md-5:bungeecord-chat:1.16-R0.4-deprecated+build.6") // Paper
 +    api("net.md-5:bungeecord-chat:1.19-R0.1-SNAPSHOT") // Paper // Prismarine
-     api("org.yaml:snakeyaml:1.33") // Paper
+     api("org.yaml:snakeyaml:1.33")
      // Paper start
      api("com.googlecode.json-simple:json-simple:1.1.1") {
 diff --git a/src/main/java/org/bukkit/configuration/ConfigurationSection.java b/src/main/java/org/bukkit/configuration/ConfigurationSection.java

patches/api/0010-Force-despawn-API.patch

@@ -0,0 +1,21 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: AlphaKR93 <[email protected]>
+Date: Sun, 2 Oct 2022 21:26:54 +0900
+Subject: [PATCH] Force despawn API
+
+
+diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
+index fe84d277c14b41e0718d63695117088ff29991f8..2517519e8de8088e5876bfa5bc3fec2225baec8c 100644
+--- a/src/main/java/org/bukkit/entity/Entity.java
++++ b/src/main/java/org/bukkit/entity/Entity.java
+@@ -371,6 +371,10 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+      */
+     public void remove();
+
++    // Prismarine start
++    public void setRemove(boolean force);
++    // Prismarine end
++
+     /**
+      * Returns true if this entity has been marked for removal.
+      *

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

@@ -2086,7 +2086,7 @@ index 12cf4d3dfbd2c4f4a1815f5e26e59ae8667f7b47..bbe9568b8df69f5f1ef08dc02dc8ee6a
      public final String id;
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 1c8661afcfaaf56953cef3a5c26fbc4fa3ac5b1c..ded69bc892aaf35cc57a562116bb623c07b08550 100644
+index 0318c9483a4d96eb39ff4df9054a9e6398186bc3..26efc49b4530112c8bd3f580ce375ab4203c9609 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -142,7 +142,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -2123,7 +2123,7 @@ index 1c8661afcfaaf56953cef3a5c26fbc4fa3ac5b1c..ded69bc892aaf35cc57a562116bb623c
      @Override
      public boolean hurt(DamageSource source, float amount) {
          if (this.isInvulnerableTo(source)) {
-@@ -1903,6 +1910,20 @@ public abstract class LivingEntity extends Entity {
+@@ -1906,6 +1913,20 @@ public abstract class LivingEntity extends Entity {
          return this.lastClimbablePos;
      }
 
@@ -2144,7 +2144,7 @@ index 1c8661afcfaaf56953cef3a5c26fbc4fa3ac5b1c..ded69bc892aaf35cc57a562116bb623c
      public boolean onClimbable() {
          if (this.isSpectator()) {
              return false;
-@@ -3583,7 +3604,10 @@ public abstract class LivingEntity extends Entity {
+@@ -3586,7 +3607,10 @@ public abstract class LivingEntity extends Entity {
              Vec3 vec3d1 = new Vec3(entity.getX(), entity.getEyeY(), entity.getZ());
 
              // Paper - diff on change - used in CraftLivingEntity#hasLineOfSight(Location) and CraftWorld#lineOfSightExists
@@ -2157,7 +2157,7 @@ index 1c8661afcfaaf56953cef3a5c26fbc4fa3ac5b1c..ded69bc892aaf35cc57a562116bb623c
      }
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 557e90e54439ce0430075403392b5052d5181feb..5ab1f5d36a61e7a7fe8da4e74f75963ea6432101 100644
+index fffa6ba329b38433a1df51df339df652d3fda828..e89b88eb3d4202ea7ff043dc9e92163332cd10d3 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -210,14 +210,16 @@ public abstract class Mob extends LivingEntity {
@@ -2408,7 +2408,7 @@ index 3dd4e6d622a6daafa00ae971edd88a147e34beef..32cca29fd622d18030931e1f33079149
          this.level.getProfiler().pop();
          this.level.getProfiler().push("tadpoleActivityUpdate");
 diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-index 962a6dfed8496959b3f7eac12c7f55fb1b9c57d1..0a700defc04f649fb45cb3d3df1e332f39f6d89a 100644
+index a4690391df0aa26abea1ad92e6143eb19c5d1143..3c3453638e117609190787efbf5d87fc20dcf8fd 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 @@ -163,9 +163,11 @@ public class Goat extends Animal {
@@ -2951,10 +2951,10 @@ index d89471935b2b5888cb5d1f6829ae479003451fda..0277633fd328ef9993fea4ac29df83b5
      }
 
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index e31a2eea9a62ab2c0bed1a97dab6bae231b8cd8b..1f4acc1a2605f1e9051126fc811a5479351fc61a 100644
+index df83b6f0e217eec4c9e9707be0030c129fdeb545..386ed2c102aaa3ec68e828e20fff6bfe0d8f7877 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-@@ -414,12 +414,12 @@ public final class NaturalSpawner {
+@@ -415,12 +415,12 @@ public final class NaturalSpawner {
          }
      }