Allow configuring block blast resistance (#1140)

This commit is contained in:
Melncat
2022-10-01 16:56:08 -07:00
committed by GitHub
parent 314b754541
commit eb97af3240
48 changed files with 166 additions and 121 deletions

View File

@@ -59,10 +59,10 @@ index 93afb1cb8c0980a2a66590a27de28fd79595635b..40dc37c7acabc8eb601035d5a61cf09e
// Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index d8de85a7b7d2b622401003c0a06f2ddc3848e8df..bd3bc984b885fe236927fb559bb05d9556edbe89 100644
index 695e6376fcf3306be49e593126576c1773b5792e..bf3bbe2d26f5ce6e6b00b36d9ea269df7d19e92d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -266,6 +266,11 @@ public class PurpurConfig {
@@ -268,6 +268,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 d8de85a7b7d2b622401003c0a06f2ddc3848e8df..bd3bc984b885fe236927fb559bb05d95
public static boolean commandGamemodeRequiresPermission = false;
public static boolean hideHiddenPlayersFromEntitySelector = false;
public static String uptimeFormat = "<days><hours><minutes><seconds>";
@@ -288,6 +293,13 @@ public class PurpurConfig {
@@ -290,6 +295,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);