Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper & Pufferfish)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@0c1643c Fix MC-252439 (#7994)
PaperMC/Paper@0ae78d3 Fix advancement saving before reloads (#8003)
PaperMC/Paper@f428887 Prevent empty items from being added to world (#7998)
PaperMC/Paper@dd61319 Couple fixes for command blocks (#8004)
PaperMC/Paper@d1b1c6f Add missing deprecation to AdvancementDisplayType (#7876)
PaperMC/Paper@81f2eec [ci skip] rebuild patches
PaperMC/Paper@e269a0a Fix incorrect random nextLong to nextInt (#8009)
PaperMC/Paper@b77fe3a Temp: Disable javadoc.io for now
PaperMC/Paper@7688112 [ci skip] restore jd.io
PaperMC/Paper@b0eb4e0 Fix number parsing (#8013)

Pufferfish Changes:
pufferfish-gg/Pufferfish@fdfb106 Fix version checker
pufferfish-gg/Pufferfish@b4104a6 Updated Upstream (Paper)
This commit is contained in:
BillyGalbreath
2022-06-18 13:19:15 -05:00
parent a92a8df112
commit def1bd407d
17 changed files with 73 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
patches/server/0001-Pufferfish-Server-Changes.patch
View File

@@ -953,7 +953,7 @@ index 0000000000000000000000000000000000000000..53f2df00c6809618a9ee3d2ea72e85e8
+}
diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishVersionFetcher.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishVersionFetcher.java
new file mode 100644
index 0000000000000000000000000000000000000000..adafc4fd661cf080b004b86c3eaed231a0133101
index 0000000000000000000000000000000000000000..e877921370f6009a4bd204d9b17d2d58834b8822
--- /dev/null
+++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishVersionFetcher.java
@@ -0,0 +1,136 @@
@@ -989,8 +989,8 @@ index 0000000000000000000000000000000000000000..adafc4fd661cf080b004b86c3eaed231
+ private static final Logger LOGGER = Logger.getLogger("PufferfishVersionFetcher");
+ private static final HttpClient client = HttpClient.newHttpClient();
+
+ private static final URI JENKINS_URI = URI.create("https://ci.pufferfish.host/job/Pufferfish-1.18/lastSuccessfulBuild/buildNumber");
+ private static final String GITHUB_FORMAT = "https://api.github.com/repos/pufferfish-gg/Pufferfish/compare/ver/1.18...%s";
+ private static final URI JENKINS_URI = URI.create("https://ci.pufferfish.host/job/Pufferfish-1.19/lastSuccessfulBuild/buildNumber");
+ private static final String GITHUB_FORMAT = "https://api.github.com/repos/pufferfish-gg/Pufferfish/compare/ver/1.19...%s";
+
+ private static final HttpResponse.BodyHandler<JsonObject> JSON_OBJECT_BODY_HANDLER = responseInfo -> HttpResponse.BodySubscribers
+ .mapping(
@@ -2141,7 +2141,7 @@ index 0000000000000000000000000000000000000000..facd55463d44cb7e3d2ca6892982f549
+ }
+}
diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
index 5a808a09291da691cbee75a55f6aa1b70ac9f018..13e49592a70285e92bf0d14ab596f3bcdebedf4c 100644
index 456595e4b7e0c7f50617aa2694b0d2dfc368ab81..bc72131afa1ae9986ee311a9b371e97c8feb38f8 100644
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
@@ -8,6 +8,7 @@ import net.kyori.adventure.text.Component;
@@ -2197,7 +2197,7 @@ index 7034af8ad42940c5af6b9032b9873ce36c55a2a7..c0fdc5a79107f8694a514a12d5526bd4
public static long getCoordinateKey(final ChunkPos pair) {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 32dc0cd20a4dd8fc02be1f7ba3d727db826dbe5d..99751fc36a332f2f9115b56ed6ca66ab037825d3 100644
index 77cd45f616e2ff38ad6a648b8b865a99e544f3ec..e96ff8b13b1237d7c70359b78e4d72938877191f 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -295,6 +295,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2218,7 +2218,7 @@ index 32dc0cd20a4dd8fc02be1f7ba3d727db826dbe5d..99751fc36a332f2f9115b56ed6ca66ab
}
public SystemReport fillSystemReport(SystemReport details) {
@@ -2221,6 +2223,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2228,6 +2230,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
public ProfilerFiller getProfiler() {
@@ -2416,7 +2416,7 @@ index 3b144c820531122eb37d41be06c182b5f5dc0724..1eb912ad97f9663bf6bd336ad739f255
this.wasOnGround = this.entity.isOnGround();
this.teleportDelay = 0;
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 0dc7a827aeacc7fae53b1f975f45883da7db6a0c..8043a1aa9d785c78e220ea54a6ffa7388f2d501e 100644
index 2b9669df574cf95c2643344a66ad18b213bd9cd7..9e3c82e5c35ee6df68942ba505d098d7a6ae59de 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -689,7 +689,20 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -2445,7 +2445,7 @@ index 0dc7a827aeacc7fae53b1f975f45883da7db6a0c..8043a1aa9d785c78e220ea54a6ffa738
}
// Paper start - optimise random block ticking
private final BlockPos.MutableBlockPos chunkTickMutablePosition = new BlockPos.MutableBlockPos();
- private final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom();
- private final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(this.random.nextLong());
+ // private final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(); // Pufferfish - moved to super
// Paper end
@@ -2597,10 +2597,10 @@ 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 89cecb3603b41ae22efc54a9f2858a6f60e52148..4d57f2b8d08a83e404f0b81321b18c83a47ddb4e 100644
index b0728b66c54dc22a5a98f150910d07f4b38ebd7e..e6d25ab2e7e19d9fb993fdad6f650212f560cc1d 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -286,7 +286,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -291,7 +291,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
public double yo;
public double zo;
private Vec3 position;
@@ -2609,7 +2609,7 @@ index 89cecb3603b41ae22efc54a9f2858a6f60e52148..4d57f2b8d08a83e404f0b81321b18c83
private ChunkPos chunkPosition;
private Vec3 deltaMovement;
public float yRot; // Paper - private->public
@@ -408,6 +408,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -413,6 +413,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return this.originWorld;
}
// Paper end
@@ -2621,7 +2621,7 @@ index 89cecb3603b41ae22efc54a9f2858a6f60e52148..4d57f2b8d08a83e404f0b81321b18c83
public float getBukkitYaw() {
return this.yRot;
}
@@ -431,17 +436,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -436,17 +441,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
this.isLegacyTrackingEntity = isLegacyTrackingEntity;
}
@@ -2659,7 +2659,7 @@ index 89cecb3603b41ae22efc54a9f2858a6f60e52148..4d57f2b8d08a83e404f0b81321b18c83
for (Entity passenger : passengers) {
org.spigotmc.TrackingRange.TrackingRangeType passengerType = passenger.trackingRangeType;
int passengerRange = chunkMap.getEntityTrackerRange(passengerType.ordinal());
@@ -450,6 +474,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -455,6 +479,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
range = passengerRange;
}
}
@@ -2669,7 +2669,7 @@ index 89cecb3603b41ae22efc54a9f2858a6f60e52148..4d57f2b8d08a83e404f0b81321b18c83
return chunkMap.playerEntityTrackerTrackMaps[type.ordinal()].getObjectsInRange(MCUtil.getCoordinateKey(this));
}
@@ -781,6 +808,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -786,6 +813,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
// CraftBukkit end
public void baseTick() {
@@ -2682,7 +2682,7 @@ index 89cecb3603b41ae22efc54a9f2858a6f60e52148..4d57f2b8d08a83e404f0b81321b18c83
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;
@@ -3973,16 +4006,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3978,16 +4011,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
@@ -2708,7 +2708,7 @@ index 89cecb3603b41ae22efc54a9f2858a6f60e52148..4d57f2b8d08a83e404f0b81321b18c83
double d1 = 0.0D;
boolean flag = this.isPushedByFluid();
boolean flag1 = false;
@@ -3990,14 +4025,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3995,14 +4030,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
int k1 = 0;
BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
@@ -2776,7 +2776,7 @@ index 89cecb3603b41ae22efc54a9f2858a6f60e52148..4d57f2b8d08a83e404f0b81321b18c83
if (d2 >= axisalignedbb.minY) {
flag1 = true;
@@ -4019,9 +4101,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4024,9 +4106,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
// CraftBukkit end
}
}
@@ -3093,7 +3093,7 @@ index 56dd01801f56c56d07101e7e22b58ac059f5f07f..f489301701f8abfb8f509d91089c1433
this.level.getProfiler().pop();
this.level.getProfiler().push("goatActivityUpdate");
diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
index ae4b251e10babb07055d031ff48ac7dd5d4be4a0..fa612a4f4abc5185c9142af31f5d7f6e92549350 100644
index 08f15739dd7e2ab80718ab8d983b483a46309deb..64c8eefa0302b04b416cd4912c01c50feddf1301 100644
--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
@@ -249,10 +249,16 @@ public class ItemEntity extends Entity {
@@ -3450,14 +3450,14 @@ index 468c635d31cfa8051666bbefce8df4b448e9ed93..17e869074b8cf29a8c3280499a27e951
final String id;
private final GameRules.Category category;
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index d59dea221ba0f1b9c14f403d3c6ea61b2c454316..e845d4af797b8eeb75ab094e1cb1062c7ab2d8b9 100644
index d59dea221ba0f1b9c14f403d3c6ea61b2c454316..a26799f92db1699d2d5173e2e93be29273e1a317 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -272,6 +272,17 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
public abstract ResourceKey<LevelStem> getTypeKey();
+ protected final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(); public net.minecraft.util.RandomSource getThreadUnsafeRandom() { return this.randomTickRandom; } // Pufferfish - move thread unsafe random initialization // Pufferfish - getter
+ protected final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(java.util.concurrent.ThreadLocalRandom.current().nextLong()); public net.minecraft.util.RandomSource getThreadUnsafeRandom() { return this.randomTickRandom; } // Pufferfish - move thread unsafe random initialization // Pufferfish - getter
+
+ // Pufferfish start - ensure these get inlined
+ private final int minBuildHeight, minSection, height, maxBuildHeight, maxSection;
@@ -3750,7 +3750,7 @@ index a71414397bd45ee7bcacfeef0041d80dfa25f114..d66806565770cb03a21794f99e5c4b0f
@Override
diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
index 8ab1d401ed55d4cce55704317cbffe53ebc9f119..cfc7901125c127b155c5e7d5875f0fd0c8bb9c01 100644
index ccad692aba2ed77259f6814d88f01b91ed9d229b..698a0ac71cf9fb409d609a81cc2958121260a46d 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
@@ -43,7 +43,10 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
@@ -4182,7 +4182,7 @@ index b1992ed5136cc7dcf04219868b94b3c37ae36b4b..5b5339cba819368f4d6b7eaf404fa59b
@Nullable
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index f1e5ccfbcd08a73ac3aba9a1cb7b414faef81f9e..7899ae5e60ee2b30c6d4d7056c59bb38cc05b7c8 100644
index 72311b27bb642ee05dba45b76935277d183012eb..8fea63ed3e9e036f1371645c5fae183677ca7970 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -243,7 +243,7 @@ import javax.annotation.Nullable; // Paper