From f759891df70f5a8cca97fd9eb65eeddc00c78f5f Mon Sep 17 00:00:00 2001
From: Bavadin <115598588+Bavadin@users.noreply.github.com>
Date: Fri, 13 Dec 2024 23:15:52 -0800
Subject: [PATCH] Moved onServer setup to before setup/all (0.13.3)

---
 .../do2/functions/events/on_datapack_load.mcfunction  | 11 ++++++-----
 .../data/do2/functions/version.mcfunction             |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Brilliance Datapack/data/do2/functions/events/on_datapack_load.mcfunction b/Brilliance Datapack/data/do2/functions/events/on_datapack_load.mcfunction
index 458045fe..19f8c52f 100644
--- a/Brilliance Datapack/data/do2/functions/events/on_datapack_load.mcfunction	
+++ b/Brilliance Datapack/data/do2/functions/events/on_datapack_load.mcfunction	
@@ -2,6 +2,12 @@
 execute as @a[scores={do2.logs.datapack_setup=1..}] run tellraw @s "§f[§9B§r]: Datapack loaded."
 # - End Log -
 
+
+# Check if I'm on the server or not.
+scoreboard players set $dungeon do2.utility.onServer 0
+function do2:agronet/test_for_agronet
+
+
 # Setup scoreboard
 function do2:scoreboard/setup/all
 # Setup stats room
@@ -31,10 +37,6 @@ time set noon
 weather clear
 
 
-# Check if I'm on the server or not.
-scoreboard players set $dungeon do2.utility.onServer 0
-function do2:agronet/test_for_agronet
-
 # If server has agronet, than set worldspawn to be the deck area.
 # Otherwise set worldspawn to be the portal
 execute if score $dungeon do2.utility.onServer matches 0 run setworldspawn -524 103 2167
@@ -89,6 +91,5 @@ execute if score $dungeon do2.utility.onServer matches 0 run setblock -562 116 1
 execute if score $dungeon do2.utility.onServer matches 0 run setblock -564 116 1983 air
 
 
-
 # Setup GUI storage
 function do2:gui/init_storage
diff --git a/Brilliance Datapack/data/do2/functions/version.mcfunction b/Brilliance Datapack/data/do2/functions/version.mcfunction
index 75cfbd25..7619c374 100644
--- a/Brilliance Datapack/data/do2/functions/version.mcfunction	
+++ b/Brilliance Datapack/data/do2/functions/version.mcfunction	
@@ -1,3 +1,3 @@
-# DATAPACK VERSION NUMBER: 0.13.2
+# DATAPACK VERSION NUMBER: 0.13.3
 
-tellraw @s ["",{"text":"The §o§n§aBrilliance Datapack§r's version is: [§b0.13.2§r] Check latest version "},{"text":"§o§b§nhere§r","clickEvent":{"action":"open_url","value":"https://github.com/trackedout/Brilliance/blob/main/Brilliance%20Datapack/data/do2/functions/version.mcfunction"}},{"text":"."}]
+tellraw @s ["",{"text":"The §o§n§aBrilliance Datapack§r's version is: [§b0.13.3§r] Check latest version "},{"text":"§o§b§nhere§r","clickEvent":{"action":"open_url","value":"https://github.com/trackedout/Brilliance/blob/main/Brilliance%20Datapack/data/do2/functions/version.mcfunction"}},{"text":"."}]