dasd

LoveTropics · Nov 3, 2023 · f515afe · f515afe
1 parent c6fc33e
commit f515afe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/data/lt/functions/club/bouncer/on_tick.mcfunction b/data/lt/functions/club/bouncer/on_tick.mcfunction
@@ -11,4 +11,4 @@ execute as @a[distance=..45,gamemode=!spectator,gamemode=!creative,tag=!club.joi
 
 # Keep players without the main.operator tag from getting close to the club when in spectator and creative
 tp @a[tag=!main.operator,gamemode=spectator,distance=..65] 2335 131 2403
-tp @a[tag=!main.operator,gamemode=adventure,distance=..65] 2335 131 2403
+tp @a[tag=!main.operator,gamemode=creative,distance=..65] 2335 131 2403
diff --git a/data/lt/functions/club/on_tick.mcfunction b/data/lt/functions/club/on_tick.mcfunction
@@ -5,13 +5,15 @@ execute as @a[tag=club.speaking_with_gibnut,tag=club.has_enough_disguises] at @s
 execute as @a[tag=club.speaking_with_gibnut,tag=!club.has_enough_disguises] at @s run function lt:club/gibnut/reject_on_tick
 
 # Disguise detection (abstracted out for efficiency :))
-execute in tropicraft:tropics as @e[tag=club.disguise_tracker] at @s if entity @e[type=player,distance=..35] run function lt:club/disguise_tracker_tick
+execute in tropicraft:tropics as @e[tag=club.disguise_tracker,type=marker] at @s if entity @e[type=player,distance=..35] run function lt:club/disguise_tracker_tick
 
 # Bouncer / Club system
-execute in tropicraft:tropics as @e[tag=club.the_club] at @s if entity @p[distance=..45] run function lt:club/bouncer/on_tick
+execute in tropicraft:tropics as @e[tag=club.the_club,type=marker] at @s if entity @p[distance=..45] run function lt:club/bouncer/on_tick
 
 # Exit detection
-execute as @e[tag=club.internal_exit] at @s run tp @a[distance=..2.5,gamemode=!spectator,tag=club.joined] @e[tag=club.exit,sort=random,limit=1]
+execute as @e[tag=club.internal_exit,type=marker] at @s run tp @a[distance=..2.5,gamemode=!spectator,tag=club.joined] @e[tag=club.exit,sort=random,limit=1]
+execute as @e[tag=club.internal_exit,type=marker] at @s run tp @e[distance=..2.5,tag=club.bouncer] 2370 31 2391
+
 
 # Ensure players who leave disguise tracker entity range have their team reset
 execute as @a[scores={club.disguiseWearTrack=1}] at @s unless entity @e[tag=club.disguise_tracker,distance=..35] unless entity @e[tag=club.the_club,distance=..48] run function lt:club/reset_team