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

Adds option for display name in afk message (#1332)

Browse Source
This commit is contained in:
Rhythmic
2023-06-07 09:51:42 -07:00
committed by GitHub
parent 561164b800
commit f4296d6226
49 changed files with 156 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0202-Add-compass-command.patch
View File

@@ -17,7 +17,7 @@ index 23e19bfbc41c5982a746ad0b5ba8c5834c2494a5..314ab6183e31b4bac6a40c1f8007d48e
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 244ca77d8d50c4e30b90fc2df46bc7c291f94744..0ac5a879c9098ea37f23cf4a23046e82c27231f4 100644
index d1f569a7813717552c20a0392b9bc9b2862ecc00..086c49137da6f29abbfd11a17f50128c106a42e7 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -280,6 +280,7 @@ public class ServerPlayer extends Player {
@@ -44,7 +44,7 @@ index 244ca77d8d50c4e30b90fc2df46bc7c291f94744..0ac5a879c9098ea37f23cf4a23046e82
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2711,5 +2714,13 @@ public class ServerPlayer extends Player {
@@ -2716,5 +2719,13 @@ public class ServerPlayer extends Player {
public void tpsBar(boolean tpsBar) {
this.tpsBar = tpsBar;
}
@@ -59,10 +59,10 @@ index 244ca77d8d50c4e30b90fc2df46bc7c291f94744..0ac5a879c9098ea37f23cf4a23046e82
// Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 2c470ffdd3137e185e224de864d4248a4a290b41..7fe9d7939f6263878209724f38418006d680ba7b 100644
index 714acff3f53ef463d1de1d5f301b9a2f89711acc..351fc72f0d1450114285b0577e8d5e533ad62901 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -251,6 +251,11 @@ public class PurpurConfig {
@@ -253,6 +253,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 2c470ffdd3137e185e224de864d4248a4a290b41..7fe9d7939f6263878209724f38418006
public static boolean commandGamemodeRequiresPermission = false;
public static boolean hideHiddenPlayersFromEntitySelector = false;
public static String uptimeFormat = "<days><hours><minutes><seconds>";
@@ -273,6 +278,13 @@ public class PurpurConfig {
@@ -275,6 +280,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);
@@ -89,7 +89,7 @@ index 2c470ffdd3137e185e224de864d4248a4a290b41..7fe9d7939f6263878209724f38418006
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 6ea932028d3d429b23f3ed9e5f7fe852a0534ad4..95b44570978d036107b4b282d39289fed550cefe 100644
index 3523fed89e2f42ef3e92c91a5f12c9aa92e3d32d..c346ebfa1df94dd523ef2a11778f42e0266e22c7 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -224,6 +224,7 @@ public class PurpurWorldConfig {