Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 17:07: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@27516ee Temp fix for EntityType.translationKey
PaperMC/Paper@8fced9d [ci skip] Update paperweight to 1.5.1 (#8856)
PaperMC/Paper@f9dc371 Fix calling UnknownCommandEvent (#8232)
This commit is contained in:
granny
2023-02-17 03:20:27 -08:00
parent fccccfa194
commit 41593baf70
19 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0204-Add-compass-command.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add compass command
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
index b779b4a7118fbcc24752369a5944536f5ecccaf1..244f5b5a7a7e781c27d21477d798f65ff77d4bc6 100644
index 6c6ff5e192a4a2273a4ce7330ec3c3e0748b632d..3501c04a9dd745b56d701bc20e18ead4add726f5 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
+++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -220,6 +220,7 @@ public class Commands {
@@ -221,6 +221,7 @@ public class Commands {
org.purpurmc.purpur.command.PingCommand.register(this.dispatcher); // Purpur
org.purpurmc.purpur.command.UptimeCommand.register(this.dispatcher); // Purpur
org.purpurmc.purpur.command.TPSBarCommand.register(this.dispatcher); // Purpur
@@ -17,7 +17,7 @@ index b779b4a7118fbcc24752369a5944536f5ecccaf1..244f5b5a7a7e781c27d21477d798f65f
if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 4d984fc18bba2da2dd709440dbf845ee1586f677..3f642a1a6d74d80d78e06441b50769810b820364 100644
index deac14655caf03a95034c77aa7fd2bd807eb48a9..3dd0dab4a56dab8cbe833d53ecdd5a8a3d2e8198 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -271,6 +271,7 @@ public class ServerPlayer extends Player {
@@ -89,7 +89,7 @@ index 31f5d9bcc11dc78b0d04c55560d5a2fa18bf3896..42532975d8c5558a7598e759838e75f2
hideHiddenPlayersFromEntitySelector = getBoolean("settings.command.hide-hidden-players-from-entity-selector", hideHiddenPlayersFromEntitySelector);
uptimeFormat = getString("settings.command.uptime.format", uptimeFormat);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 27b06d6ebe464c14b7795161a0692540858ad4f9..a2d367b331bb9e23643a64172385798adfc57552 100644
index 6d739c7d355a569380f22c8c2ced499ea339b2e6..66e5521e3c9fef9fa7d0fbeafe88e328acc5b828 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -223,6 +223,7 @@ public class PurpurWorldConfig {