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

Rebase on latest Purpur (#230)

Browse Source
This commit is contained in:
Encode42
2021-03-24 20:26:18 -04:00
committed by GitHub
parent 754948e524
commit b6235af624
94 changed files with 261 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/0143-Config-migration-climbing-should-not-bypass-cramming.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Config migration: climbing should not bypass cramming
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 3836602aba80a1e23bbec451d6948159b10dd24d..322cecf1a7316fb8fe00ff538fe3a2dd21708819 100644
index a8d2df5ba1d6400dc3431f7aaf148a0691007e9c..7b9f5e04af48e9c5ab9769b8f45ed2b2853dd98c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -145,6 +145,17 @@ public class PurpurConfig {
@@ -28,7 +28,7 @@ index 3836602aba80a1e23bbec451d6948159b10dd24d..322cecf1a7316fb8fe00ff538fe3a2dd
public static String afkBroadcastBack = "§e§o%s is no longer AFK";
public static String afkTabListPrefix = "[AFK] ";
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 3387b3af053cc6a79e89b6273b9121ca2734b81e..5ad9b63e50137163ec7bab48560f618f165d676f 100644
index eb6e752ca3be8fc933eec58f639952990393bb1f..d6f98a1b4bcc44bad7c8e39f31ea61cd7428f071 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -96,6 +96,17 @@ public class PurpurWorldConfig {