From ad394477f7e8c99ab2857731629089574c71a883 Mon Sep 17 00:00:00 2001
From: Chromachine <chromagamingstaff@gmail.com>
Date: Wed, 29 Jul 2020 11:51:26 +0000
Subject: [PATCH] Fix stuff in update script

---
 Multiverse-Core/worlds.yml | 126 ++++++++++++++++++-------------------
 PlotSquared/user_cache.db  | Bin 12288 -> 0 bytes
 Server/server.properties   |   8 +--
 update.sh                  |   4 +-
 4 files changed, 69 insertions(+), 69 deletions(-)
 delete mode 100644 PlotSquared/user_cache.db

diff --git a/Multiverse-Core/worlds.yml b/Multiverse-Core/worlds.yml
index cef8eb0..12330ee 100644
--- a/Multiverse-Core/worlds.yml
+++ b/Multiverse-Core/worlds.yml
@@ -1,51 +1,4 @@
 worlds:
-  world:
-    ==: MVWorld
-    hidden: 'false'
-    alias: world
-    color: WHITE
-    style: NORMAL
-    pvp: 'true'
-    scale: '1.0'
-    respawnWorld: worldhub
-    allowWeather: 'true'
-    difficulty: HARD
-    spawning:
-      ==: MVSpawnSettings
-      animals:
-        ==: MVSpawnSubSettings
-        spawn: 'true'
-        spawnrate: '-1'
-        exceptions: []
-      monsters:
-        ==: MVSpawnSubSettings
-        spawn: 'true'
-        spawnrate: '-1'
-        exceptions: []
-    entryfee:
-      ==: MVEntryFee
-      amount: '0.0'
-    hunger: 'true'
-    autoHeal: 'true'
-    adjustSpawn: 'true'
-    portalForm: ALL
-    gameMode: SURVIVAL
-    keepSpawnInMemory: 'false'
-    spawnLocation:
-      ==: MVSpawnLocation
-      x: -32270.5
-      y: 67.0
-      z: -8198.5
-      pitch: 20.6998
-      yaw: -1.3500259
-    autoLoad: 'true'
-    bedRespawn: 'true'
-    worldBlacklist: []
-    environment: NORMAL
-    seed: '1923020019'
-    generator: 'null'
-    playerLimit: '-1'
-    allowFlight: 'true'
   world_the_end:
     ==: MVWorld
     hidden: 'false'
@@ -93,6 +46,53 @@ worlds:
     generator: 'null'
     playerLimit: '-1'
     allowFlight: 'true'
+  world:
+    ==: MVWorld
+    hidden: 'false'
+    alias: world
+    color: WHITE
+    style: NORMAL
+    pvp: 'true'
+    scale: '1.0'
+    respawnWorld: worldhub
+    allowWeather: 'true'
+    difficulty: HARD
+    spawning:
+      ==: MVSpawnSettings
+      animals:
+        ==: MVSpawnSubSettings
+        spawn: 'true'
+        spawnrate: '-1'
+        exceptions: []
+      monsters:
+        ==: MVSpawnSubSettings
+        spawn: 'true'
+        spawnrate: '-1'
+        exceptions: []
+    entryfee:
+      ==: MVEntryFee
+      amount: '0.0'
+    hunger: 'true'
+    autoHeal: 'true'
+    adjustSpawn: 'true'
+    portalForm: ALL
+    gameMode: SURVIVAL
+    keepSpawnInMemory: 'false'
+    spawnLocation:
+      ==: MVSpawnLocation
+      x: -32270.5
+      y: 67.0
+      z: -8198.5
+      pitch: 20.6998
+      yaw: -1.3500259
+    autoLoad: 'true'
+    bedRespawn: 'true'
+    worldBlacklist: []
+    environment: NORMAL
+    seed: '1923020019'
+    generator: 'null'
+    playerLimit: '-1'
+    allowFlight: 'true'
   world_nether:
     ==: MVWorld
     hidden: 'false'
@@ -187,16 +187,16 @@ worlds:
     generator: PlotSquared
     playerLimit: '-1'
     allowFlight: 'true'
-  flatworld:
+  worldhub:
     ==: MVWorld
     hidden: 'false'
-    alias: flatworld
+    alias: worldhub
     color: WHITE
     style: NORMAL
     pvp: 'true'
     scale: '1.0'
     respawnWorld: ''
-    allowWeather: 'true'
+    allowWeather: 'false'
     difficulty: HARD
     spawning:
       ==: MVSpawnSettings
@@ -207,7 +207,7 @@ worlds:
         exceptions: []
       monsters:
         ==: MVSpawnSubSettings
-        spawn: 'true'
+        spawn: 'false'
         spawnrate: '-1'
         exceptions: []
     entryfee:
@@ -217,20 +217,20 @@ worlds:
     autoHeal: 'true'
     adjustSpawn: 'true'
     portalForm: ALL
-    gameMode: SURVIVAL
+    gameMode: ADVENTURE
     keepSpawnInMemory: 'false'
     spawnLocation:
       ==: MVSpawnLocation
-      x: -256.0
+      x: 162.5
       y: 4.0
-      z: -96.0
+      z: -95.5
       pitch: 0.0
       yaw: 0.0
     autoLoad: 'true'
     bedRespawn: 'true'
     worldBlacklist: []
     environment: NORMAL
-    seed: '4622440486943241231'
+    seed: '-5692829584426207714'
     generator: 'null'
     playerLimit: '-1'
     allowFlight: 'true'
@@ -281,16 +281,16 @@ worlds:
     generator: 'null'
     playerLimit: '-1'
     allowFlight: 'true'
-  worldhub:
+  flatworld:
     ==: MVWorld
     hidden: 'false'
-    alias: worldhub
+    alias: flatworld
     color: WHITE
     style: NORMAL
     pvp: 'true'
     scale: '1.0'
     respawnWorld: ''
-    allowWeather: 'false'
+    allowWeather: 'true'
     difficulty: HARD
     spawning:
       ==: MVSpawnSettings
@@ -301,7 +301,7 @@ worlds:
         exceptions: []
       monsters:
         ==: MVSpawnSubSettings
-        spawn: 'false'
+        spawn: 'true'
         spawnrate: '-1'
         exceptions: []
     entryfee:
@@ -311,20 +311,20 @@ worlds:
     autoHeal: 'true'
     adjustSpawn: 'true'
     portalForm: ALL
-    gameMode: ADVENTURE
+    gameMode: SURVIVAL
     keepSpawnInMemory: 'false'
     spawnLocation:
       ==: MVSpawnLocation
-      x: 162.5
+      x: -256.0
       y: 4.0
-      z: -95.5
+      z: -96.0
       pitch: 0.0
       yaw: 0.0
     autoLoad: 'true'
     bedRespawn: 'true'
     worldBlacklist: []
     environment: NORMAL
-    seed: '-5692829584426207714'
+    seed: '4622440486943241231'
     generator: 'null'
     playerLimit: '-1'
     allowFlight: 'true'
diff --git a/PlotSquared/user_cache.db b/PlotSquared/user_cache.db
deleted file mode 100644
index f8c63320895855f8e66b2fd81d7c8a4563179d23..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeHMJB(ac8J_hx-krA-+i@&o?>LTQukGVK?*}puV_6vCgkU^K5unL=?u>VKW-||G
z2PjAZN(UV>qCrYS1BeP*A_@uwG=vHSqJtXI!GFeysf=%#;$H2%zkAL--}n9hnfdlh
zU%WG%$8MTT_w2mODn~18Yn4xTyOm0X!L16n505o?a`?j+@R(me?O>H_H{WY@{#`lL
zxnAj9@BI2{CzPL;43rF%43rF%43rF%43rF%43rF%43rF%41ClWc>BoO`pM1BwYR@A
zw{8>{vpDtE5B~S$(9OHIZrr=oy?5g?cW!mxcno->dug#4hVGYd+`W1G#@$PdZgpS%
z!oBXRy*qcVb~9{j_u>;ie(mn(Ub%7i_3r0yz5ZyJtu1os$jMuqYn9<R#Dm$JBltz%
zw~P5?^}7Ff+CF*wH2<#O$b7coc4hsYO6PZ-hn+!(w*S-qP5b-pVf%W!*?PbAZfn2w
z@zzH3kIf%7$IVYQ*BifYJZuaarm<1~VcpalwZGJUR{K`%cJ0K*pErKI@y(4_Ha@og
z_w}FG@2|g8|3jXkJW2*i21*7>21*7>2A;&gC0y-w@S}qucwF7F{A_ji!ADqK#+R$T
zO{=8#Tn5BNVu(BAk#US7Og&GYQx%vS+c2E&Ep~@;tJ=Hb5;4jvf|#NLaqSH<i7}L1
zQdSGiI1D$nJCpHjWS4PD71_R2?VX8OM#Te1G+K&yqy!miEW*hNt>KP~V0Yqp?gj>3
ztoBY>#);t}BF7VfOLG(%CInK_2gV~yF}cZXFj-Enyj<;_5HTs?DMLgOSdNVfSy%&#
z4hJnbw_3q8amp@Kdl$5`f-5PJ#f$@31Z1@r2pb~=XI>f^;Qtu&I8CF)!NF3zRPAjg
z%at}UAt#7KoZyHwNfv2IJ+X`m$J_$GIZbEL_Ty+YjO2W^cTQm#%_>;4us|{89%&i_
ztiyzaz0{aGAH#I$9}K9HF9OGjYnKdD$UB-4_ckIMlt5lHVWW`DU^cL`$*x@v$8eG3
zIKOtT+B?lDv(7k)gdiI61Vr298DfNRmWVV~iTidsJ(v$r7bxaba}}{i!YQ~ktT|{&
zDH2!(MX3)i$i1l_O~U2PYVVk2EZ`793@a7lG65AqgM=8S(mryKe>jX+&sKXUnbuN7
z3KR*Q<py_Y!eMA*DWybehs|O<?Bne-U=D%<<u*Aa8O4Y*YCv_Z5Xb~lhX}fcFztih
zet@^Zw=Q6>C}^C7m53V$3~>yS2Wg_B;2lO@olM>EwKyNL(;#_L-jHM@N^nJpD<}*n
zgGGW`6E!7XCA$YxEWd8Y^WiuO3X*FbeR7T<tprTtlSUfsiUQ~vgOwa+nh)Yz@CA8q
zI2!HQ@%AZLP6)w7=Rjzt!6_ERaE605tpa6jfIl&wJcy&^Y>r+4Ar!1p1~4}hD%WD5
zNQXd>BrH;`5>edd>l#eAPv-GslEP_$oK64-JTlsQpulPATo70&u<sH~I1$goIwI7#
zlggk#1gN20UPk~A1{I73sf?!gCj&bk$64Q7XGh{hUOovn`sh&NU@Fex+8oG-d{#u@
zNU@5mn(fc#cG^#q19=?mO9>5>C5(c?Ky{1^8JoQy0u?5KrZ6s4$+!>2;+Fk1e+wN0
z7JN#c2qu9A>tQ+%1`rlQX$nidh=gOlI{}A1AkRTzL0gdCWcjJE*^UZn=wQfF%sfyG
zJx1>i$2&XI$z&GUvtR-tT*6FZMDdCT4#EhZl~p=Q2R=$BEe6v#?ayP}o8Y71H83(W
z)+r>w3IO#W4u{jdRZOJ_)hUyo#<&l^*%r71XGrj$us{H~7VNA9)Kye5FG+X<-6Bd0
zwwVo<`@<dHuJ$fU%%O%{LOxNLLx5B|aE_c8pg(s?C2dE;*<@s)CE01Dt!nSQ6O<ZB
z611S)#sc`vGOJLa!9XW-Rw=Rv9m4y`WEa{|6Icr>GU)IW!~vJ(@&|J(j+75ZMr$bJ
z_`dbKGw3Uru|{T1CZ{8X9w{Q|DQ!YlO0aXF+HjAhb#l+<6Z-oP_KCPwhhF4`4L)xw
zL^3!Di--*85kYMSE+bY_$jLz*4HtV?YS6!vR4zu7Jq=x(YX;LLjFFd|>!e^S(s;Jq
zRaZBlyMXn)_Kcw9p=fx5eZ)Bpo-x=3$BAOl>R}B5uY(*|JEK&j2=*H&7augpVPFUI
zK4R!fMujwru=fPmPxuj#!y67ADne^>6s+Yze0awo7A?UX2N*sq#xtAZY!0VdMxFs`
zZD1G*CBi(=_@G*#{Yoxj+aiYO1Z5_}Y=5{5y#>QIa~LMFOj(a%SF|!3P>{oR0_A~%
z4iWT}&=~y4hUJ6B$lLK`9Ji}b|Ip(kiv**Hv;Dopc~63#iK9+Jc@MpAXE2$~hqK5J
z!8B0_Prwp@fGXjHz?Fr(J8<SK3EE3Z4)QS@j#rP{YcP$*2?IAUxXarKxEIPF!xaV%
z6N6JEr90E*{y<7qhc6^oYG*68v+cjNf7$qI^S2FF|3&?;t<Bc$_9tuqXua2{cfQm5
zK|M9MI)7@u+j_I{e*JjuSDmlbKHK4~e>T2d+i&l58qI&TPc$pdyS0a%pEkcy|8Dzx
zji1y%@uY7%<@+TAB?Bb`B?Bb`B?Bb`A5{h*09pGWdHKJg49>tJnat%3EE2_RWnhu)
z<<e^E0-4Lj3@nniyqtkWl9me@SR`F}DFch-Dd$%s7D!QE%)lbC$+<_sr{^Wz3@nnA
zY-V7QnB;5*7D-6XWMGkGBnNV9MFNr28CWC)p&3{t_BfS+MdFSZRwEV&I!<O_k$~g*
z3@j39oXEf;A;$3xERtFr%fKRe#d8^0B&B#Z1B)aRM>DWUAkkR?3*->(3@j2ov@)<r
z-q6gzA}K>71B)aJ^$aW$DbzBsNSv^-0v1RT)>qe9AV4^hfkiTdXI8)hNx|U^ED{b>
QGq6Y~a0rt4T9F*!zcBiGjsO4v

diff --git a/Server/server.properties b/Server/server.properties
index 0433cda..49f509a 100644
--- a/Server/server.properties
+++ b/Server/server.properties
@@ -1,5 +1,5 @@
 #Minecraft server properties
-#Sun Jul 26 12:01:28 UTC 2020
+#Tue Jul 28 13:02:45 UTC 2020
 spawn-protection=16
 max-tick-time=60000
 query.port=25565
@@ -41,11 +41,11 @@ spawn-animals=true
 white-list=false
 rcon.password=
 generate-structures=true
-online-mode=false
 max-build-height=256
+online-mode=false
 level-seed=1923020019
-prevent-proxy-connections=false
 use-native-transport=true
+prevent-proxy-connections=false
 enable-jmx-monitoring=false
-motd=Chromacraft v5
 enable-rcon=false
+motd=Chromacraft v5
diff --git a/update.sh b/update.sh
index fd798a1..0a1109f 100755
--- a/update.sh
+++ b/update.sh
@@ -12,12 +12,12 @@ git add -f 'dynmap/configuration.txt' 'dynmap/worlds.txt' 'dynmap/templates/cust
 git add -f 'MythicMobs/*' ':!:MythicMobs/SavedData/*'
 git add -f ':(glob)Jobs/*.yml' ':!:Jobs/furnaceBrewingStands.yml'
 git add -f 'Towny/settings/*' ':!:Towny/settings/*.rej' ':!:Towny/settings/english.yml'
-git add -f 'PlotSquared/*' ':!:PlotSquared/*storage*' ':!:PlotSquared/translations*'
+git add -f 'PlotSquared/*' ':!:PlotSquared/*storage*' ':!:PlotSquared/translations*' ':!:PlotSquared/user_cache.db'
 #git add -f 'PermissionsEx/permissions.yml'
 git add -f 'Multiverse-Core/worlds.yml'
 git add -f 'ServerRunner/config.yml' # Not a plugin
 git add -f 'DungeonsXL/dungeons' 'DungeonsXL/scripts'
-git add -f ':(glob)TerrainControl/*' 'TerrainControl/worlds/world/*'
+#git add -f ':(glob)TerrainControl/*' 'TerrainControl/worlds/world/*'
 git add -f 'Server/*' # Files are hardlinked from one above
 git add -f 'Factions/config'