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

Updated Upstream (Paper & Airplane)

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

Paper Changes:
b470400d5c Add methods to find targets for lightning strikes (#6712)
381a1462b3 Fix unplaced block states after new chunk gen API (#6747)
523a55c609 Fix loading cmds in datapacks (#6641)
a61827df91 VanillaCommandWrapper didnt account for entity senders (#6586)
cd610df101 Re-readd root/admin user detection (#6703)
4a0d935cd0 Always allow item changing in EntityFireball (#5493)
54813dbb21 [ci skip] Misc gradle updates (#6763)
56e65fd3a7 Null check isApplicable for CraftBlockEntityState#update
8575248648 Use ChatRenderer.defaultRenderer() when legacy events have not modified the format (#6104)

Airplane Changes:
f96ca1ce5d Upstream
89cdb2c72a Update Paperweight deps
317e61bb48 We love CI testing
This commit is contained in:
William Blake Galbreath
2021-10-13 07:51:34 -05:00
parent 91d3e65a73
commit 32fc651f97
9 changed files with 36 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0141-Implement-TPSBar.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Implement TPSBar
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
index 42deff516bd363d0882b441fa6928ac7eecbfccc..386e9ad013369633e2be543b9281e5a5fdce9c74 100644
index 4308cf798c7f97532ee56369a11afe4dbf7a898f..d734addd622f6d429a79df08310bce562db3425e 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
+++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -201,6 +201,7 @@ public class Commands {
@@ -17,7 +17,7 @@ index 42deff516bd363d0882b441fa6928ac7eecbfccc..386e9ad013369633e2be543b9281e5a5
if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 41b58dae909445c677ce4b66a3f2020b9153d359..9c5c4db0638591f030008322003c6cb0d097034c 100644
index c4d33daf24df7c5955f282da312a2c9384de1ff4..d87f8d7414d630890c33e41e602936068d48abd3 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1134,6 +1134,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -29,10 +29,10 @@ index 41b58dae909445c677ce4b66a3f2020b9153d359..9c5c4db0638591f030008322003c6cb0
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 25cd8b550a81cf144fed62f32320cd2e0ab11f94..9cff21030215ab60a219fa719e8140c0c331a06b 100644
index 235e16740ad0419b8ea8793af2f6013fda24d503..4909f57006af0c8bc69773952e93d5546c3d8cbf 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -351,6 +351,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -361,6 +361,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
DedicatedServer.LOGGER.info("JMX monitoring enabled");
}
@@ -84,7 +84,7 @@ index 8df2dcc97091d1b3025f9a7296d3c7badb54a630..a2542b5d72393b6e0a06bd5e21c1e4e9
// 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 e17c61e3b807dbc1a7bca4952349145617204154..cf016f139895690d5a0e0ef2709e31eaea31649a 100644
index c53acfd01eac8c64f068a3c2a2a458b0c1b033a1..22a5cc3ade3cf1431a9d352fa2c30d3234413997 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -483,6 +483,7 @@ public abstract class PlayerList {