Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 01:47:42 +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

2
patches/server/0110-Raid-cooldown-setting.patch
View File

@@ -52,7 +52,7 @@ index c939ca087af4588e14669a2d53d7c116dcb59f16..11271762dcf5783c3179de1afc6a882c
if (!this.raids.containsKey(raid.getId())) {
this.raids.put(raid.getId(), raid);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 1d144ed296120eccee1001fd1299ead48351cbfa..9dcc2f52641e9196487744f4a1e8ae0f312aaff8 100644
index b60ac4576578f9dc95b66ad2932b046f7f50317e..847975c3c2309633e1505b9ee37d9d7ba9019f0f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -173,6 +173,7 @@ public class PurpurWorldConfig {