Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 08:57:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

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

Paper Changes:
PaperMC/Paper@afa16e6 Modify offline mode warning to include Velocity line (#8812)
PaperMC/Paper@de38a45 Add projectile hit simulation API (#8816)
PaperMC/Paper@7e7e6b4 More Win Screen API (#8805)
PaperMC/Paper@bd77b78 Fix desync of honeycomb when the event is canceled (#8713)
PaperMC/Paper@bb05fcf Add missing isFuel Material entries (#8843)
PaperMC/Paper@8d1acf6 Call PlayerReadyArrowEvent for when items in the offhand are used (#8842)
PaperMC/Paper@f2f9e8c Remove patch that was made obsolete by vanilla (#8847)
This commit is contained in:
granny
2023-02-13 15:48:05 -08:00
parent 0090323edb
commit 08aa4dccaa
19 changed files with 54 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0121-Implement-TPSBar.patch
View File

@@ -29,10 +29,10 @@ index 1953eaab247d7482773cac79dafd651a23dff2da..33975783ec484d7d67851d69b5f3c85e
this.hasLoggedStop = true; // Paper
if (isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread("Server stopped"); // Paper
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 44be589011acb90c0d662cb1eb2697cfefd7fba5..f0d4e4e98148fabeb90ae6a22855ed0c8d49d08a 100644
index ca6a2fee12ac8a89dae57aa2787462f190463cd0..d1fcdddbc1b08679e17407ca12934350a3d1b882 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -345,6 +345,9 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -351,6 +351,9 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
}
if (gg.pufferfish.pufferfish.PufferfishConfig.enableAsyncMobSpawning) mobSpawnExecutor.start(); // Pufferfish
@@ -43,7 +43,7 @@ index 44be589011acb90c0d662cb1eb2697cfefd7fba5..f0d4e4e98148fabeb90ae6a22855ed0c
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index d0a76519d85d4c9e4dc0b98d038a4c447ce5e833..62fa71b3f9fe488c3b7d44d5c294894744317b96 100644
index 792548064ae3b633fd1a2a975957a932ef7ac2d7..b27ca203c7e581faca92cf8169cb2b04629bf093 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -270,6 +270,7 @@ public class ServerPlayer extends Player {
@@ -85,7 +85,7 @@ index d0a76519d85d4c9e4dc0b98d038a4c447ce5e833..62fa71b3f9fe488c3b7d44d5c2948947
// Purpur end
}
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index f2cfcefefaf71ba0f49a1aea34886fd9cb7b69e2..fb06e34821db74a4af4bd56392a5aaae839a8387 100644
index 52bf4eda9b74086fcf8177e781c246fa5f364cfc..91e8e4cf82cb2c6cff17a6c588a7ffdb0b4da75e 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -455,6 +455,7 @@ public abstract class PlayerList {