SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into pre/1.13

Browse Source 
* master:
  fix missed break statement and enum check on dupe uuid resolve
This commit is contained in:
Aikar
2018-08-03 01:33:34 -04:00
parent c4fd14d690 a72b697cbb
commit 919b04c7b8
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Spigot-Server-Patches/Configurable-Allowance-of-Permanent-Chunk-Loaders.patch
View File

@@ -7,7 +7,7 @@ This disables the behavior that allows players to keep chunks permanently loaded
by default and allows server operators to enable it if they wish.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 50d3483eb0..5b14973810 100644
index 809441fc63..4a135d84db 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -0,0 +0,0 @@ public class PaperWorldConfig {