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)

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

Paper Changes:
PaperMC/Paper@eb0693f Fix EntityDeathEvent cancellation (#9323)
PaperMC/Paper@f8cfdd4 Fix SmithingInventory helper slot methods for 1.20 (#9325)
PaperMC/Paper@de19eb8 fix incorrectly updated move vector checking patch (#9328)
PaperMC/Paper@87dfff4 Implement BossBarViewer on Player (#9332)
PaperMC/Paper@2d09115 Use net.kyori.ansi for console logging (#9313)
PaperMC/Paper@b48e2e3 Fix dev bundle generation
PaperMC/Paper@c287e92 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9301)
PaperMC/Paper@2e363c7 1.20.1 (#9333)
This commit is contained in:
Ben Kerllenevich
2023-06-13 13:40:15 -04:00
parent 788c14f02c
commit cc465d63cd
103 changed files with 302 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,10 +17,10 @@ index e5b1b6ad32c48a4ba13b4930954fad18669677ad..4e721dfca7559620d8ce65a6703f2089
if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 12a5a8c06dc636fbd5008b8f71d05cfae00a52c2..7b67bc1e7891a27125db560ad18a133096bb2468 100644
index 6b7d87c337dc2cdbf1b7ad415a7ec0f709285ae3..c89c7c78612cf86c2632832ab85ea8cdfb71c0ed 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1023,6 +1023,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1021,6 +1021,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.safeShutdown(waitForShutdown, false);
}
public void safeShutdown(boolean waitForShutdown, boolean isRestarting) {
@@ -42,7 +42,7 @@ index 44d76c80e67bc0d5ab28e26bfcf64e2534e627a5..76477e68578674017c5b3c514bb5c78b
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index f71101057b89cd0393d8a64760d1ae9e7a50beb6..81947e1dc48b91600f9b6417c13d153a41a9d502 100644
index 3997d78770c503802bd354819d0258c16329858d..c177b6ebf0e2d10d19674094a4fed8637d305bda 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -279,6 +279,7 @@ public class ServerPlayer extends Player {
@@ -84,7 +84,7 @@ index f71101057b89cd0393d8a64760d1ae9e7a50beb6..81947e1dc48b91600f9b6417c13d153a
// 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 3a0e295c4718e5aadcf953016cad3d0fc4953f3c..a54e67c8b1ba45e2c666ac7b883e08e67a1b7403 100644
index 7ae44092d3a585791d7a2267cfb6b710a9bc037d..3cd656afdd612c265c812233736f5f343c0a6e48 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -476,6 +476,7 @@ public abstract class PlayerList {