Revert accidental changes

NeunEinser · Sep 23, 2023 · cf38d5b · cf38d5b
1 parent 6f30a8b
commit cf38d5b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -44,10 +44,10 @@ You may also download from [CurseForge](https://www.curseforge.com/minecraft/wor
 
 ## Detailed Feature Overview
 
-### Custum HUD
+### Custom HUD
 
 While in-game you will have a bunch of custom HUD elements around your hotbar. This utilizes a custom font and does not require any mods.
-![Custum HUD](screenshots/HUD.png)
+![Custom HUD](screenshots/HUD.png)
 
 The HUD can be customized in the Lobby and elements can be moved however you prefer them to be layed out, or individual components can be removed.
 

diff --git a/datapack/data/fetchr/functions/game/start/init_teams.mcfunction b/datapack/data/fetchr/functions/game/start/init_teams.mcfunction
@@ -28,8 +28,8 @@ scoreboard players set $team_count fetchr.state 0
 execute if entity @a[predicate=fetchr:is_in_game, team=fetchr.dark_red,limit=1] run data modify storage fetchr:card teams[{id: "fetchr:dark_red"}].backgroundIndex set value 0b
 execute if entity @a[predicate=fetchr:is_in_game, team=fetchr.dark_red,limit=1] run scoreboard players add $team_count fetchr.state 1
 
-execute store result storage fetchr:card teams[{id: "fetchr:red"}].backgroundIndex byte 1 run scoreboard players get $team_count fetchr.state
-execute run scoreboard players add $team_count fetchr.state 1
+execute if entity @a[predicate=fetchr:is_in_game, team=fetchr.red,limit=1] store result storage fetchr:card teams[{id: "fetchr:red"}].backgroundIndex byte 1 run scoreboard players get $team_count fetchr.state
+execute if entity @a[predicate=fetchr:is_in_game, team=fetchr.red,limit=1] run scoreboard players add $team_count fetchr.state 1
 
 execute if entity @a[predicate=fetchr:is_in_game, team=fetchr.orange,limit=1] store result storage fetchr:card teams[{id: "fetchr:orange"}].backgroundIndex byte 1 run scoreboard players get $team_count fetchr.state
 execute if entity @a[predicate=fetchr:is_in_game, team=fetchr.orange,limit=1] run scoreboard players add $team_count fetchr.state 1
@@ -89,7 +89,7 @@ execute if score $lockout_mode fetchr.state matches 1 run data modify storage tm
 data modify storage tmp.fetchr:game/start defaultBackground set value []
 
 execute if entity @a[predicate=fetchr:is_in_game, team=fetchr.dark_red,limit=1] run function fetchr:game/start/init_teams/dark_red
-execute run function fetchr:game/start/init_teams/red
+execute if entity @a[predicate=fetchr:is_in_game, team=fetchr.red,limit=1] run function fetchr:game/start/init_teams/red
 execute if entity @a[predicate=fetchr:is_in_game, team=fetchr.orange,limit=1] run function fetchr:game/start/init_teams/orange
 execute if entity @a[predicate=fetchr:is_in_game, team=fetchr.yellow,limit=1] run function fetchr:game/start/init_teams/yellow
 execute if entity @a[predicate=fetchr:is_in_game, team=fetchr.lime,limit=1] run function fetchr:game/start/init_teams/lime

diff --git a/datapack/data/fetchr/functions/tick/tick.mcfunction b/datapack/data/fetchr/functions/tick/tick.mcfunction
@@ -14,7 +14,7 @@ execute in fetchr:lobby run function neun_einser.timer:store_current_time
 # Detect second (or more) players in a LAN world
 #NEUN_SCRIPT unless realms
 execute store result score $is_multiplayer fetchr.state if entity @a
-#scoreboard players remove $is_multiplayer fetchr.state 1
+scoreboard players remove $is_multiplayer fetchr.state 1
 execute if score $is_multiplayer fetchr.state matches 2.. run scoreboard players set $is_multiplayer fetchr.state 1
 
 # Detect the resource pack not being active server-side (So either we are on a