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

@@ -104,10 +104,10 @@ index d0db1623c8132eb4c9a51b6e452280c56f544bf5..8182e9d69083ade08ae0b9c0512b8b7b
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 6a18c21653bb2146734cdbc552a31ce0c70545c7..cbe4d2d692edf29f9f6587871058fc1b3c53a731 100644
index c4bdb9f2aab98d8915f4079f4815c10f97334f71..0507a090fb9122fdda4111fbd2ad3c51e4ef5c36 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -179,6 +179,7 @@ public class PurpurConfig {
@@ -181,6 +181,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";
@@ -115,7 +115,7 @@ index 6a18c21653bb2146734cdbc552a31ce0c70545c7..cbe4d2d692edf29f9f6587871058fc1b
private static void messages() {
cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
afkBroadcastAway = getString("settings.messages.afk-broadcast-away", afkBroadcastAway);
@@ -188,6 +189,7 @@ public class PurpurConfig {
@@ -190,6 +191,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);
@@ -123,7 +123,7 @@ index 6a18c21653bb2146734cdbc552a31ce0c70545c7..cbe4d2d692edf29f9f6587871058fc1b
}
public static String serverModName = "Purpur";
@@ -210,6 +212,29 @@ public class PurpurConfig {
@@ -212,6 +214,29 @@ public class PurpurConfig {
disableGiveCommandDrops = getBoolean("settings.disable-give-dropping", disableGiveCommandDrops);
}