Merge branch 'base' into battle

Legacy-Edition-Minigames · Dec 22, 2024 · 8fb2232 · 8fb2232
2 parents d0ac475 + 0211b6e
commit 8fb2232
Show file tree

Hide file tree

Showing 16 changed files with 3 additions and 0 deletions.
diff --git a/world/datapacks/lem.base/data/lem.base/functions/start.mcfunction b/world/datapacks/lem.base/data/lem.base/functions/start.mcfunction
@@ -4,6 +4,9 @@ execute unless entity @a run function lem.base:install
 ##Set relog score to 1 if there are no players online
 execute unless entity @a run scoreboard players set * lem.relog 1
 
+##Enable festive event
+scoreboard players set #Store lem.event.festive 1
+
 ##Check for relog
 function lem.base:relog/check
 

diff --git a/world/dimensions/lem.base/lobby_festive/data/fabricDynamicRegistry.dat b/world/dimensions/lem.base/lobby_festive/data/fabricDynamicRegistry.dat
diff --git a/world/dimensions/lem.base/lobby_festive/data/fabricRegistry.dat b/world/dimensions/lem.base/lobby_festive/data/fabricRegistry.dat
diff --git a/world/dimensions/lem.base/lobby_festive/data/fabricRegistry.dat.1 b/world/dimensions/lem.base/lobby_festive/data/fabricRegistry.dat.1
diff --git a/world/dimensions/lem.base/lobby_festive/data/fabricRegistry.dat.2 b/world/dimensions/lem.base/lobby_festive/data/fabricRegistry.dat.2
diff --git a/world/dimensions/lem.base/lobby_festive/data/raids.dat b/world/dimensions/lem.base/lobby_festive/data/raids.dat
diff --git a/world/dimensions/lem.base/lobby_festive/entities/r.-1.-1.mca b/world/dimensions/lem.base/lobby_festive/entities/r.-1.-1.mca
diff --git a/world/dimensions/lem.base/lobby_festive/entities/r.-1.-2.mca b/world/dimensions/lem.base/lobby_festive/entities/r.-1.-2.mca
diff --git a/world/dimensions/lem.base/lobby_festive/entities/r.-1.0.mca b/world/dimensions/lem.base/lobby_festive/entities/r.-1.0.mca
diff --git a/world/dimensions/lem.base/lobby_festive/entities/r.-2.-1.mca b/world/dimensions/lem.base/lobby_festive/entities/r.-2.-1.mca
diff --git a/world/dimensions/lem.base/lobby_festive/entities/r.-2.-2.mca b/world/dimensions/lem.base/lobby_festive/entities/r.-2.-2.mca
diff --git a/world/dimensions/lem.base/lobby_festive/entities/r.0.-1.mca b/world/dimensions/lem.base/lobby_festive/entities/r.0.-1.mca
diff --git a/world/dimensions/lem.base/lobby_festive/entities/r.0.0.mca b/world/dimensions/lem.base/lobby_festive/entities/r.0.0.mca
diff --git a/world/dimensions/lem.base/lobby_festive/poi/r.-1.-1.mca b/world/dimensions/lem.base/lobby_festive/poi/r.-1.-1.mca
diff --git a/world/dimensions/lem.base/lobby_festive/region/r.-1.-1.mca b/world/dimensions/lem.base/lobby_festive/region/r.-1.-1.mca
diff --git a/world/icon.png b/world/icon.png