Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 02:17: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@e552beb Fix inventory desync (#9640)
PaperMC/Paper@6f30f08 Readd old BlockDamageEvent constructor
PaperMC/Paper@6813244 Fix/improve destroy speed API (#9645)
PaperMC/Paper@7d13b70 Add titleOverride to InventoryOpenEvent (#7540)
PaperMC/Paper@0e622c7 Add sniffer egg api (#9288)
PaperMC/Paper@0c0a480 Do crystal-portal proximity check before entity lookup (#9611)

Pufferfish Changes:
pufferfish-gg/Pufferfish@30537a0 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@af1f56c Updated Upstream (Paper)
pufferfish-gg/Pufferfish@f6a081a Updated Upstream (Paper)
pufferfish-gg/Pufferfish@e148cd6 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@2611af8 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@68f7501 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@38b9f2e Updated Upstream (Paper)
pufferfish-gg/Pufferfish@2bc9d45 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@a3c0a4d Updated Upstream (Paper)
This commit is contained in:
granny
2023-08-26 22:05:21 -07:00
parent 8ef1580b1f
commit 4240de4a38
14 changed files with 59 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0269-Remove-Mojang-Profiler.patch
View File

@@ -418,7 +418,7 @@ index f4e1fc878ecf72dafade1c72869c9656a0c5b8aa..319c469c20f3cb4f6d61425bfa6d98b5
public boolean hasWork() {
diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
index 2b13f177d154ff322837e055e15fcb55941a2306..ed64df7ccfc7af16af9102b01519b3c01551bd8e 100644
index 14613af193b178133fd688f26a766b36fa969590..2d5b0f293bb30243e774bfb62b8100c01e7eb383 100644
--- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
@@ -280,16 +280,16 @@ public class ServerChunkCache extends ChunkSource {
@@ -546,7 +546,7 @@ index 2b13f177d154ff322837e055e15fcb55941a2306..ed64df7ccfc7af16af9102b01519b3c0
// Paper end - use set of chunks requiring updates, rather than iterating every single one loaded
// Paper start - controlled flush for entity tracker packets
List<net.minecraft.network.Connection> disabledFlushes = new java.util.ArrayList<>(this.level.players.size());
@@ -890,7 +890,7 @@ public class ServerChunkCache extends ChunkSource {
@@ -900,7 +900,7 @@ public class ServerChunkCache extends ChunkSource {
@Override
protected void doRunTask(Runnable task) {
@@ -768,7 +768,7 @@ index 5b7507db055d7be59b369f66e659e128c9c7e00b..221d1d0e1b4b46de6ebca5faac09bbda
while (iterator.hasNext()) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 3a51e711eb66fa1ac48a0c0d4f237e24af5f5e69..3d128b69ab5cc2ec75819ca8c88c5551d07e78f6 100644
index 01f001c39581c4af5765548e221e254465fe0195..2f013c3365d065325d645d43f7c5137f942b06df 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1241,7 +1241,7 @@ public class ServerPlayer extends Player {
@@ -791,9 +791,9 @@ index 3a51e711eb66fa1ac48a0c0d4f237e24af5f5e69..3d128b69ab5cc2ec75819ca8c88c5551
if (true) { // CraftBukkit
this.isChangingDimension = true; // CraftBukkit - Set teleport invulnerability only if player changing worlds
@@ -1284,7 +1284,7 @@ public class ServerPlayer extends Player {
@@ -1283,7 +1283,7 @@ public class ServerPlayer extends Player {
this.connection.teleport(exit); // CraftBukkit - use internal teleport without event
this.connection.resetPosition();
this.mainSupportingBlockPos = Optional.empty(); // Pufferfish - Fix paper 9372
worldserver.addDuringPortalTeleport(this);
- worldserver1.getProfiler().pop();
+ //worldserver1.getProfiler().pop(); // Purpur
@@ -1598,10 +1598,10 @@ index 0f8af63a88e425e5e66f68133b6c604caefc6977..31cfc2c8c5188a266c9e9993e5cf322e
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
index 3ab900c53469327b8d686da81ed5b4aaaddb7440..14df8a4e0c1a1dcfbbd2f4fdfd865bd77bb02325 100644
index fbc08af025e1f53696093c459656a753f8f89ebe..552777d7ef6a1190a3b84bdf2f130f735c61d275 100644
--- a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
+++ b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
@@ -519,11 +519,11 @@ public class Sniffer extends Animal {
@@ -520,11 +520,11 @@ public class Sniffer extends Animal {
@Override
protected void customServerAiStep() {