Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 09:27: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:
9b0a0d8 Add the default tick rate of the sensor to the timings (#6242)
e905eb1 Add fireball to default max load config (#6252)
2f1f1b7 Add config option to specify timings url (#6256)
efd7e51 Move "use-display-name-in-quit-message" to settings namespace (#6257)
b32a3b1 Call EntityKnockbackByEntityEvent for RamTarget Behavior (#6273)
This commit is contained in:
William Blake Galbreath
2021-07-26 21:41:58 -05:00
parent f482d19d56
commit b2056c256f
28 changed files with 100 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0223-Add-uptime-command.patch
View File

@@ -17,7 +17,7 @@ index 73953ea69776bfe1dcb1504cd14a0f003f1b5766..528fd87ae1c1c01e13885d88fc8056b0
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 652e596c37bf8d865c954b31ad7d2562b9e95c46..e74ddf6b72dbd335f8a06f05341d5a4d99afa428 100644
index fbb0840010443facb66b8e538c4fde035704896e..efddedd3fdec7fc146be5a572ce86e58d3c7c1e4 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -294,6 +294,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -29,7 +29,7 @@ index 652e596c37bf8d865c954b31ad7d2562b9e95c46..e74ddf6b72dbd335f8a06f05341d5a4d
public int autosavePeriod;
public boolean serverAutoSave = false; // Paper
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index d881cdfd3d3c6244c65f54bfa953bc5b18a644af..07e5bb1b148376b3962a983b3d192bd838e04e02 100644
index f1db3948b7284da35b9905862229bafb87a863fb..2def6767b2ee97d9c662b93796ed97bcfd3bbebc 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -166,6 +166,7 @@ public class PurpurConfig {
@@ -48,7 +48,7 @@ index d881cdfd3d3c6244c65f54bfa953bc5b18a644af..07e5bb1b148376b3962a983b3d192bd8
unverifiedUsername = getString("settings.messages.unverified-username", unverifiedUsername);
}
@@ -352,6 +354,15 @@ public class PurpurConfig {
@@ -359,6 +361,15 @@ public class PurpurConfig {
public static int commandTPSBarTickInterval = 20;
public static boolean commandGamemodeRequiresPermission = false;
public static boolean hideHiddenPlayersFromEntitySelector = false;
@@ -64,7 +64,7 @@ index d881cdfd3d3c6244c65f54bfa953bc5b18a644af..07e5bb1b148376b3962a983b3d192bd8
private static void commandSettings() {
commandTPSBarTitle = getString("settings.command.tpsbar.title", commandTPSBarTitle);
commandTPSBarProgressOverlay = BossBar.Overlay.valueOf(getString("settings.command.tpsbar.overlay", commandTPSBarProgressOverlay.name()));
@@ -365,6 +376,15 @@ public class PurpurConfig {
@@ -372,6 +383,15 @@ public class PurpurConfig {
commandTPSBarTickInterval = getInt("settings.command.tpsbar.tick-interval", commandTPSBarTickInterval);
commandGamemodeRequiresPermission = getBoolean("settings.command.gamemode.requires-specific-permission", commandGamemodeRequiresPermission);
hideHiddenPlayersFromEntitySelector = getBoolean("settings.command.hide-hidden-players-from-entity-selector", hideHiddenPlayersFromEntitySelector);