Merge branch 'battle' into toolbox-testing

Legacy-Edition-Minigames · Feb 20, 2024 · 2a0b260 · 2a0b260
2 parents 504253e + 64dd46e
commit 2a0b260
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -2,9 +2,9 @@
 
 LEM is a set of open source remakes of the Mini Games from Legacy Console Edition.
 
-![Minecraft Version](https://img.shields.io/badge/Minecraft-1.20.1-80ba42?style=for-the-badge) ![License](https://img.shields.io/github/license/DBTDerpbox/legacy-edition-battle?style=for-the-badge) ![Last Commit](https://img.shields.io/github/last-commit/dbtderpbox/legacy-edition-battle?style=for-the-badge)
+![Minecraft Version](https://img.shields.io/badge/Minecraft-1.20.4-80ba42?style=for-the-badge) ![License](https://img.shields.io/github/license/DBTDerpbox/legacy-edition-battle?style=for-the-badge) ![Last Commit](https://img.shields.io/github/last-commit/dbtderpbox/legacy-edition-battle?style=for-the-badge)
 
-[![forthebadge](https://github.com/BraveUX/for-the-badge/blob/master/src/images/badges/contains-tasty-spaghetti-code.svg)](https://forthebadge.com) ![Powered By Nostalgia](https://img.shields.io/badge/Powered_by-Nostalgia-e49454?style=for-the-badge)
+[![forthebadge](https://forthebadge.com/images/badges/contains-tasty-spaghetti-code.svg)](https://forthebadge.com) ![Powered By Nostalgia](https://img.shields.io/badge/Powered_by-Nostalgia-e49454?style=for-the-badge)
 
 The server is currently in a Closed Alpha. If you would like to see how to join please see [this page](https://www.legacyminigames.xyz/join)
 

diff --git a/world/data/scoreboardsuffix.dat b/world/data/scoreboardsuffix.dat
diff --git a/world/datapacks/lem.base/data/lem.base/functions/game/loading/resource/start.mcfunction b/world/datapacks/lem.base/data/lem.base/functions/game/loading/resource/start.mcfunction
@@ -10,11 +10,11 @@ schedule clear lem.base:game/loading/mapload/timer
 ##Mark users that dont need to reload as loaded
 tag @a[tag=ingame,tag=!loadingresources] add resourceloaded
 
-##Start resource loader check
-function lem.base:game/loading/resource/run
-
 ##Start loading animation in tablist
 #Reset loading animation
 scoreboard players set #Store lem.packtimerani 1
 #Start
 function lem.base:game/loading/resource/tablist/run
+
+##Start resource loader check
+function lem.base:game/loading/resource/run
diff --git a/world/datapacks/lem.base/data/lem.base/functions/relog/setup/patreon.mcfunction b/world/datapacks/lem.base/data/lem.base/functions/relog/setup/patreon.mcfunction
@@ -33,8 +33,6 @@ execute as 714181d0-f180-4d5b-b165-098527507d74 run scoreboard players set @s le
 execute as 8c574bb1-215b-47f5-8094-16e64d3ee2cb run scoreboard players set @s lem.patreon 1
 #Saeraphinx
 execute as 558becd6-3fca-4e64-a6d6-3d6b3b65ef4a run scoreboard players set @s lem.patreon 3
-#Trashypandius
-execute as 29cb71f8-6677-4c3e-af5e-5c387b52b258 run scoreboard players set @s lem.patreon 1
 #Jonoland
 execute as 3fe75d30-2989-45af-a12f-3565de70d9c2 run scoreboard players set @s lem.patreon 1
 #ISARICH10
@@ -81,14 +79,8 @@ execute as 0a78bcdd-d443-4ff0-9ed8-bbd0d4e6252d run scoreboard players set @s le
 execute as 95f50037-a134-4069-8e93-08e5a69a9b71 run scoreboard players set @s lem.patreon 1
 #MiMiCursed
 execute as 957e7c81-79b5-44fb-a44f-771780c41ef4 run scoreboard players set @s lem.patreon 1
-#_Arronic_
-execute as 78af622b-a7fc-4adc-8ba2-3ed561822404 run scoreboard players set @s lem.patreon 4
 #pl4yr
 execute as 17e305e8-a0ce-4e3b-85dc-8f46dff39e14 run scoreboard players set @s lem.patreon 1
-#S_N00B
-execute as e010b362-db9d-494e-a6f0-827ab11de5eb run scoreboard players set @s lem.patreon 1
-#ItzAyylmao
-execute as 60a53c79-07a0-4361-be37-2ed4a85bd45c run scoreboard players set @s lem.patreon 1
 #DylanOMGHD
 execute as c89e3f9e-c606-470a-bcf0-00e021fc3eef run scoreboard players set @s lem.patreon 1
 #WillDoesStuffs
@@ -109,6 +101,14 @@ execute as 5976b9cf-3fd2-477e-a110-15bcab30c14e run scoreboard players set @s le
 execute as 68746cdd-a551-455e-99c0-cf6634fc95c4 run scoreboard players set @s lem.patreon 1
 #notwackyy
 execute as 550fe2be-ba74-4e5a-9eb8-e10c8eeec4a4 run scoreboard players set @s lem.patreon 1
+#BrandonItaly
+execute as d8a0f2d0-99d1-43ac-a83a-2bc9479972ce run scoreboard players set @s lem.patreon 1
+#Swirlings
+execute as 8f508981-2299-4a10-b202-3fcbde8f79d8 run scoreboard players set @s lem.patreon 1
+#notyuru
+execute as fa116ca3-731e-42e9-94f6-fa40e88b3f9f run scoreboard players set @s lem.patreon 1
+#marshtomps
+execute as 2f3d0383-4b97-4127-aef1-cfc0dbb6abc8 run scoreboard players set @s lem.patreon 1
 
 ##Reset heart if no longer subscribed
 #Tiny