Update Upstream (Purpur)

pufferfish-gg · Dec 17, 2021 · ff4b8f0 · ff4b8f0
1 parent fc418c3
commit ff4b8f0
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -6,4 +6,4 @@ group=gg.pufferfish.pufferfish
 version=1.18.1-R0.1-SNAPSHOT
 mcVersion=1.18.1
 packageVersion=1_18_R1
-purpurRef=aa425ecbe841d821e67e5a9938674e66b89743ec
+purpurRef=2b02a51d43551cb6a0871e6a50d03b18a150dda7
diff --git a/patches/server/0001-Pufferfish-branding.patch b/patches/server/0001-Pufferfish-branding.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Pufferfish branding
 Update branding
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index a387cbf3652a84028dc8be1da7f10c4bb84abf3d..8770b9fba33e59975d69e557bebd643153a0aad0 100644
+index c2ed6509227843419d8117a6113e916cffe2aeba..7bc2b4e628785ae63cb9f46e93428d8d9140b613 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -19,7 +19,7 @@ repositories {
@@ -15,7 +15,7 @@ index a387cbf3652a84028dc8be1da7f10c4bb84abf3d..8770b9fba33e59975d69e557bebd6431
      // Purpur start
 -    implementation(project(":purpur-api"))
 +    implementation(project(":pufferfish-api")) // Pufferfish
-     implementation("io.papermc.paper:paper-mojangapi:1.18-R0.1-SNAPSHOT") {
+     implementation("io.papermc.paper:paper-mojangapi:1.18.1-R0.1-SNAPSHOT") {
          exclude("io.papermc.paper", "paper-api")
      }
 @@ -74,7 +74,7 @@ tasks.jar {
@@ -193,7 +193,7 @@ index 0000000000000000000000000000000000000000..d6316e1791480adce6aedced2e69f08d
 +}
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5d1bd07046af00aea3bde2f1000a4b8a1d8528cb..c6d09d92946d3f15072c76eefcd1a4e796f92557 100644
+index 58143bf03bd3314a4b7b40acb72e203aebce7fa6..cafa0065619bc97731e131b4645fc408d2003f1a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1734,7 +1734,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -209,7 +209,7 @@ index 5d1bd07046af00aea3bde2f1000a4b8a1d8528cb..c6d09d92946d3f15072c76eefcd1a4e7
 
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 00a41213ee1c03fe1835dc8bc3b12ffe5c6bbafe..6f02d335fbcfe5d655d9bd03f8a480fb56e45529 100644
+index 959cb69b37921c62a9012642acaf2d0295915e1f..04554ff4d14c8c2e6c54dc7deef7258702316f1e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -253,7 +253,7 @@ import javax.annotation.Nullable; // Paper

diff --git a/patches/server/0014-Optimize-random-calls-in-chunk-ticking.patch b/patches/server/0014-Optimize-random-calls-in-chunk-ticking.patch
@@ -46,10 +46,10 @@ index beb5b3675233a7fd3c05ae65517173b986cc701f..406bfe20a7b8786bbc6bee46151be91d
              boolean flag1 = level.ticksPerAnimalSpawns != 0L && worlddata.getGameTime() % level.ticksPerAnimalSpawns == 0L; // CraftBukkit
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 1eed6e330118954796d4d642bd78c896d95eb496..f657a0fe7f642a7de5ff7456b8f4745d264b0d98 100644
+index 8994844b6519082244fe95c1ba72dc81ac9f7f64..48f9d27428e2fde3874fb07c2100662b2b5924a2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -775,6 +775,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -779,6 +779,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
      private final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom();
      // Paper end
 
@@ -58,7 +58,7 @@ index 1eed6e330118954796d4d642bd78c896d95eb496..f657a0fe7f642a7de5ff7456b8f4745d
      public void tickChunk(LevelChunk chunk, int randomTickSpeed) {
          ChunkPos chunkcoordintpair = chunk.getPos();
          boolean flag = this.isRaining();
-@@ -785,7 +787,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -789,7 +791,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          gameprofilerfiller.push("thunder");
          final BlockPos.MutableBlockPos blockposition = this.chunkTickMutablePosition; // Paper - use mutable to reduce allocation rate, final to force compile fail on change
 
@@ -67,7 +67,7 @@ index 1eed6e330118954796d4d642bd78c896d95eb496..f657a0fe7f642a7de5ff7456b8f4745d
              blockposition.set(this.findLightningTargetAround(this.getBlockRandomPos(j, 0, k, 15))); // Paper
              if (this.isRainingAt(blockposition)) {
                  DifficultyInstance difficultydamagescaler = this.getCurrentDifficultyAt(blockposition);
-@@ -815,7 +817,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -819,7 +821,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          }
 
          gameprofilerfiller.popPush("iceandsnow");

diff --git a/patches/server/0032-Use-thread-unsafe-random-for-mob-spawning.patch b/patches/server/0032-Use-thread-unsafe-random-for-mob-spawning.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Use thread unsafe random for mob spawning
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index f657a0fe7f642a7de5ff7456b8f4745d264b0d98..a433346fa7b1a02fd5f72081ce3eea49358cd929 100644
+index 48f9d27428e2fde3874fb07c2100662b2b5924a2..713e3be837509fcb0e240e87c339496ceea1dbf6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -772,7 +772,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -776,7 +776,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
      }
      // Paper start - optimise random block ticking
      private final BlockPos.MutableBlockPos chunkTickMutablePosition = new BlockPos.MutableBlockPos();

diff --git a/patches/server/0039-Remove-lambda-from-ticking-guard.patch b/patches/server/0039-Remove-lambda-from-ticking-guard.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Remove lambda from ticking guard
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index a433346fa7b1a02fd5f72081ce3eea49358cd929..e2b90d28a93e394e52672b1061a508020eb0bdff 100644
+index 713e3be837509fcb0e240e87c339496ceea1dbf6..c062c169ea03a3e945729f0727caf1f4c4adbd07 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -692,7 +692,20 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -693,7 +693,20 @@ public class ServerLevel extends Level implements WorldGenLevel {
                              }
 
                              gameprofilerfiller.push("tick");