Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 01:47:42 +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@307778f Collision API (#6736)
PaperMC/Paper@fcb7b73 [ci skip] remove stale
PaperMC/Paper@1f0d707 Fix issues with CreeperIgniteEvent (#7507)
PaperMC/Paper@fd557b7 Undeprecate Bed's tile entity interface (#7330)

Pufferfish Changes:
pufferfish-gg/Pufferfish@002f541 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@9c5fcfd Add option to disable out-of-order chat
pufferfish-gg/Pufferfish@b21931d Fix memory leak in async pathfinder (#42)
This commit is contained in:
BillyGalbreath
2022-07-31 16:00:16 -05:00
parent f22f64e292
commit 9db159d266
14 changed files with 220 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0290-Remove-Mojang-Profiler.patch
View File

@@ -39,7 +39,7 @@ index a1b80de62f07e0b476775289ec46e3f685b41d7f..ffcc53399da282a525785426279c3194
return b0;
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index ec2c9f2e3bb89be847993205f107089ed8cc05b5..e78170ae888146c2aab6b218f7501b911a70add6 100644
index 96255e81c232f9cbc3268127d4232bb9c2c73292..d678c6e0109dabe93485fb214622a0213c790f26 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -328,13 +328,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -835,7 +835,7 @@ index ab3744184ed4e761e58ea93099a3d6e9ca68bdde..1013618b91df8b2bdf2aa3f5f9f91f0a
this.connection.send(new ClientboundPlayerAbilitiesPacket(this.getAbilities()));
playerlist.sendLevelInfo(this, worldserver);
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index af8043503f16c09a25da71a00d80a77eb5874e71..8ddd79ebc916d34d63be3d62fc3d37f5a56b3b35 100644
index 473bbdf6b98eabe55f02e93bb72e1877fcf236e9..b17b01b4689f87bae9640d41115851cc2e6170a2 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -419,7 +419,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -1726,7 +1726,7 @@ index 01477e7240f9e33d08d416a7d40ee10f3e5d4abf..c9def2202d7c2a523858ec124df2beaf
}
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index d270d0f47d26085ce7912b61a66b922a95871a73..ee54cbdaecbdd285fe3f74f902f01f964b569521 100644
index 582613e9c45135b2cc0c02f457e5c3d61d138c86..018a5c13d3f0321d4346e6c1845f1aed2b8de3dd 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -713,9 +713,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1837,10 +1837,10 @@ index ab024c5315c0a7cb2f80d5d7b251f6a3531879b3..12293740461b6cd965297543a1ae3bea
if (throwable instanceof ThreadDeath) throw throwable; // Paper
// Paper start - Prevent tile entity and entity crashes
diff --git a/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java b/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java
index e6593d081b9349d68d45b645455d28f6f00d7c00..aca4100964a1f225bd93390f521073e2bc15c04f 100644
index 0455c8a7da880da4f0b7ae9d57e83e281a55f0ae..23cb03d28c43729d5b5d450cd975456512477353 100644
--- a/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java
+++ b/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java
@@ -78,8 +78,8 @@ public class PathFinder {
@@ -80,8 +80,8 @@ public class PathFinder {
// Paper start - optimize collection
private Path findPath(ProfilerFiller profiler, Node startNode, List<Map.Entry<Target, BlockPos>> positions, float followRange, int distance, float rangeMultiplier) {
// readd the profiler code for sync