Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 02:17:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow configuring block blast resistance (#1140)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0300-Implement-ram-and-rambar-commands.patch
View File

@@ -61,10 +61,10 @@ index 6979305279996be59756d0424e5bc16a19fde6b0..12637019da44019475042e4cf88d3e0e
return this.tpsBar;
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 3e1a8de7d2f23a8e9218bf56e3fd18c48ffe14df..8d12ba33da62b58f6390a812fd025ede6032ed88 100644
index d75604b369b44e493da22a5408530b644c6dc1d6..697367da89959abc7145c76d49f6d801d9ab0b23 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -179,6 +179,8 @@ public class PurpurConfig {
@@ -181,6 +181,8 @@ 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";
@@ -73,7 +73,7 @@ index 3e1a8de7d2f23a8e9218bf56e3fd18c48ffe14df..8d12ba33da62b58f6390a812fd025ede
public static String tpsbarCommandOutput = "<green>Tpsbar toggled <onoff> for <target>";
public static String dontRunWithScissors = "<red><italic>Don't run with scissors!";
public static String uptimeCommandOutput = "<green>Server uptime is <uptime>";
@@ -194,6 +196,8 @@ public class PurpurConfig {
@@ -196,6 +198,8 @@ 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);
@@ -82,7 +82,7 @@ index 3e1a8de7d2f23a8e9218bf56e3fd18c48ffe14df..8d12ba33da62b58f6390a812fd025ede
tpsbarCommandOutput = getString("settings.messages.tpsbar-command-output", tpsbarCommandOutput);
dontRunWithScissors = getString("settings.messages.dont-run-with-scissors", dontRunWithScissors);
uptimeCommandOutput = getString("settings.messages.uptime-command-output", uptimeCommandOutput);
@@ -258,6 +262,15 @@ public class PurpurConfig {
@@ -260,6 +264,15 @@ public class PurpurConfig {
disableGiveCommandDrops = getBoolean("settings.disable-give-dropping", disableGiveCommandDrops);
}
@@ -98,7 +98,7 @@ index 3e1a8de7d2f23a8e9218bf56e3fd18c48ffe14df..8d12ba33da62b58f6390a812fd025ede
public static String commandTPSBarTitle = "<gray>TPS<yellow>:</yellow> <tps> MSPT<yellow>:</yellow> <mspt> Ping<yellow>:</yellow> <ping>ms";
public static BossBar.Overlay commandTPSBarProgressOverlay = BossBar.Overlay.NOTCHED_20;
public static TPSBarTask.FillMode commandTPSBarProgressFillMode = TPSBarTask.FillMode.MSPT;
@@ -286,6 +299,16 @@ public class PurpurConfig {
@@ -288,6 +301,16 @@ public class PurpurConfig {
public static String uptimeSecond = "%02d second";
public static String uptimeSeconds = "%02d seconds";
private static void commandSettings() {