Implement death messages for stonecutter and running with scissors

This commit is contained in:
BillyGalbreath
2021-12-31 08:54:29 -06:00
parent 2d51101945
commit 2e4174e033
21 changed files with 166 additions and 59 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add uptime command
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
index abf803d4627b4345c6a91763486320a484f8a81b..4c243155b4a4a5f69bcf0558574ac31b35bea971 100644
index 3156e7e43a5114aaaa1276b024f4ec45e797de88..e787ccc3c21f7e966c1e291579bf7550ee6de696 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
+++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -208,6 +208,7 @@ public class Commands {
@@ -29,7 +29,7 @@ index dc95a1230ac6f86c32b3c6a8e4876725dbb3c033..022cf286342abe9f5349b70e096373a0
public int autosavePeriod;
public Commands vanillaCommandDispatcher;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 6be7293e6e368b2b05502b3e086cceb113a3cad4..64a8dad26d17a9f921d4fd57991dab955e08afb5 100644
index 1f48ae6381464f823650d2774fca1117f38d20e9..bdad489cdcf21c951eba5fb295aaf1c1af563676 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -166,6 +166,7 @@ public class PurpurConfig {
@@ -48,7 +48,7 @@ index 6be7293e6e368b2b05502b3e086cceb113a3cad4..64a8dad26d17a9f921d4fd57991dab95
unverifiedUsername = getString("settings.messages.unverified-username", unverifiedUsername);
}
@@ -224,6 +226,15 @@ public class PurpurConfig {
@@ -231,6 +233,15 @@ public class PurpurConfig {
public static int commandTPSBarTickInterval = 20;
public static boolean commandGamemodeRequiresPermission = false;
public static boolean hideHiddenPlayersFromEntitySelector = false;
@@ -64,7 +64,7 @@ index 6be7293e6e368b2b05502b3e086cceb113a3cad4..64a8dad26d17a9f921d4fd57991dab95
private static void commandSettings() {
commandTPSBarTitle = getString("settings.command.tpsbar.title", commandTPSBarTitle);
commandTPSBarProgressOverlay = BossBar.Overlay.valueOf(getString("settings.command.tpsbar.overlay", commandTPSBarProgressOverlay.name()));
@@ -237,6 +248,15 @@ public class PurpurConfig {
@@ -244,6 +255,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);