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

Add configurable "sleep.not_possible" actionbar message (#1414)

Browse Source
This commit is contained in:
Joshua Prince
2023-08-22 23:58:26 -07:00
committed by GitHub
parent 20c48cd66b
commit ddc4fa9243
20 changed files with 79 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0198-Add-compass-command.patch
View File

@@ -17,7 +17,7 @@ index 7aae9e3c60ba15b8dcd8174a4d70866edebb6cca..5f6cc8b16af6dce3b74f0c2c662b0ecf
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 784634596696521cfbd58e85392183dd96b843b0..597a85ec28382410efb255bebb326ad16841ded1 100644
index b724a6fd90e6774db1f64090dc4854b6de4a9f44..6045da26c79bbb1c96319b6582bacef836024dec 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -281,6 +281,7 @@ public class ServerPlayer extends Player {
@@ -44,7 +44,7 @@ index 784634596696521cfbd58e85392183dd96b843b0..597a85ec28382410efb255bebb326ad1
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2806,5 +2809,13 @@ public class ServerPlayer extends Player {
@@ -2818,5 +2821,13 @@ public class ServerPlayer extends Player {
public void tpsBar(boolean tpsBar) {
this.tpsBar = tpsBar;
}
@@ -59,10 +59,10 @@ index 784634596696521cfbd58e85392183dd96b843b0..597a85ec28382410efb255bebb326ad1
// Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 34eae29ed89a32bed6777b514e6beed2cb3cd177..90a72821a61dc00fbac9efac3d1cc3fb3ed72f22 100644
index fe0f582291d61b1fd6f1916a39d62bfaf5abfa49..853cf54077d760f1118ce494b401d286d789e5fc 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -253,6 +253,11 @@ public class PurpurConfig {
@@ -255,6 +255,11 @@ public class PurpurConfig {
public static String commandTPSBarTextColorMedium = "<gradient:#ffff55:#ffaa00><text></gradient>";
public static String commandTPSBarTextColorLow = "<gradient:#ff5555:#aa0000><text></gradient>";
public static int commandTPSBarTickInterval = 20;
@@ -74,7 +74,7 @@ index 34eae29ed89a32bed6777b514e6beed2cb3cd177..90a72821a61dc00fbac9efac3d1cc3fb
public static boolean commandGamemodeRequiresPermission = false;
public static boolean hideHiddenPlayersFromEntitySelector = false;
public static String uptimeFormat = "<days><hours><minutes><seconds>";
@@ -275,6 +280,13 @@ public class PurpurConfig {
@@ -277,6 +282,13 @@ public class PurpurConfig {
commandTPSBarTextColorMedium = getString("settings.command.tpsbar.text-color.medium", commandTPSBarTextColorMedium);
commandTPSBarTextColorLow = getString("settings.command.tpsbar.text-color.low", commandTPSBarTextColorLow);
commandTPSBarTickInterval = getInt("settings.command.tpsbar.tick-interval", commandTPSBarTickInterval);