Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 01:47:42 +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

14
patches/server/0120-Implement-TPSBar.patch
View File

@@ -42,7 +42,7 @@ index ca6a2fee12ac8a89dae57aa2787462f190463cd0..e0b2819d6c73a9ca1fa60ff71d29e201
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 02078f459eb7230a5ac9b4499d961c8b37e5b196..06c225972d5a92296042ff612634f81298b32107 100644
index 91a2081acf514b61033b669dc331b223c84adfbd..d526d2374008bdaac4b03437e24da25a7915cbeb 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 {
@@ -69,7 +69,7 @@ index 02078f459eb7230a5ac9b4499d961c8b37e5b196..06c225972d5a92296042ff612634f812
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2698,5 +2701,13 @@ public class ServerPlayer extends Player {
@@ -2703,5 +2706,13 @@ public class ServerPlayer extends Player {
this.server.getPlayerList().respawn(this, toLevel, true, to, !toLevel.paperConfig().environment.disableTeleportationSuffocationCheck, org.bukkit.event.player.PlayerRespawnEvent.RespawnReason.DEATH);
}
}
@@ -84,7 +84,7 @@ index 02078f459eb7230a5ac9b4499d961c8b37e5b196..06c225972d5a92296042ff612634f812
// 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 68905d5121eb05b825602d2bf24612283481c205..cfe70ad065f7c5919faad67b171b9dbbabaea51c 100644
index 91166ac140e14a4300ecbec8d80716b175fd2889..37943331eecee6263041b64d274a8be682a1039d 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -469,6 +469,7 @@ public abstract class PlayerList {
@@ -105,10 +105,10 @@ index 68905d5121eb05b825602d2bf24612283481c205..cfe70ad065f7c5919faad67b171b9dbb
entityplayer.awardStat(Stats.LEAVE_GAME);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index ce59c8dbbf6cdc684befe9302107645795576e48..74882c48068d01d59adbfc0c51bd7f2b7f756e6a 100644
index b1757cd2f828304ca7376eed6eea01f816b26550..70db296b80b98b378917f68037420ae150e14adb 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -181,6 +181,7 @@ public class PurpurConfig {
@@ -182,6 +182,7 @@ public class PurpurConfig {
public static String creditsCommandOutput = "<green>%s has been shown the end credits";
public static String demoCommandOutput = "<green>%s has been shown the demo screen";
public static String pingCommandOutput = "<green>%s's ping is %sms";
@@ -116,7 +116,7 @@ index ce59c8dbbf6cdc684befe9302107645795576e48..74882c48068d01d59adbfc0c51bd7f2b
private static void messages() {
cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
afkBroadcastAway = getString("settings.messages.afk-broadcast-away", afkBroadcastAway);
@@ -190,6 +191,7 @@ public class PurpurConfig {
@@ -192,6 +193,7 @@ public class PurpurConfig {
creditsCommandOutput = getString("settings.messages.credits-command-output", creditsCommandOutput);
demoCommandOutput = getString("settings.messages.demo-command-output", demoCommandOutput);
pingCommandOutput = getString("settings.messages.ping-command-output", pingCommandOutput);
@@ -124,7 +124,7 @@ index ce59c8dbbf6cdc684befe9302107645795576e48..74882c48068d01d59adbfc0c51bd7f2b
}
public static String serverModName = "Purpur";
@@ -212,6 +214,29 @@ public class PurpurConfig {
@@ -214,6 +216,29 @@ public class PurpurConfig {
disableGiveCommandDrops = getBoolean("settings.disable-give-dropping", disableGiveCommandDrops);
}