Browse Source

Debug fix

LTCatt 5 years ago
parent
commit
c7591ecbb1

+ 1 - 1
data/ltw/functions/state/3/state_enter.mcfunction

@@ -1,6 +1,6 @@
 # 要求系统进入状态 3(主要阶段结束,初始化小游戏)
 scoreboard players set $state mem 3
-execute as @a run function ltw:state/3/player_enter
+execute as @a[team=!debugging] run function ltw:state/3/player_enter
 
 # HUD
 scoreboard objectives setdisplay belowName total_score_disp

+ 1 - 1
data/ltw/functions/state/3/tick2.mcfunction

@@ -1,3 +1,3 @@
 # 固定旁观
-execute as @a run spectate
+execute as @a[team=!debugging] run spectate
 tp @a[team=!debugging] 0 10000 1000 0 0

+ 1 - 1
data/ltw/functions/state/4/state_enter.mcfunction

@@ -1,6 +1,6 @@
 # 要求系统进入状态 4(展示小游戏)
 scoreboard players set $state mem 4
-execute as @a run function ltw:state/4/player_enter
+execute as @a[team=!debugging] run function ltw:state/4/player_enter
 
 # 初始化倒计时
 scoreboard players set $countdown mem 10

+ 1 - 1
data/ltw/functions/state/5/state_enter.mcfunction

@@ -1,6 +1,6 @@
 # 要求系统进入状态 5(小游戏进行中)
 scoreboard players set $state mem 5
-execute as @a run function ltw:state/5/player_enter
+execute as @a[team=!debugging] run function ltw:state/5/player_enter
 
 # 调用游戏开始
 function mini:main/game_start

+ 1 - 1
data/ltw/functions/state/6/state_enter.mcfunction

@@ -1,6 +1,6 @@
 # 要求系统进入状态 6(小游戏结束)
 scoreboard players set $state mem 6
-execute as @a run function ltw:state/6/player_enter
+execute as @a[team=!debugging] run function ltw:state/6/player_enter
 
 # HUD
 scoreboard objectives setdisplay belowName total_score_disp

+ 1 - 1
data/ltw/functions/state/7/state_enter.mcfunction

@@ -1,6 +1,6 @@
 # 要求系统进入状态 7(选择奖励)
 scoreboard players set $state mem 7
-execute as @a run function ltw:state/7/player_enter
+execute as @a[team=!debugging] run function ltw:state/7/player_enter
 
 # HUD
 scoreboard objectives setdisplay belowName total_score_disp

+ 1 - 1
data/mini/functions/colormatch/game/start_new_round.mcfunction

@@ -33,4 +33,4 @@ execute if score $color_match_time mem matches 10 as @a[team=!debugging,gamemode
 
 # 更新地板方块
 scoreboard players operation $color_match_current mem = $color_match_floor mem
-execute as @a run function mini:colormatch/game/show_floor_block
+execute as @a[team=!debugging] run function mini:colormatch/game/show_floor_block

+ 2 - 2
data/mini/functions/colormatch/game_end.mcfunction

@@ -2,5 +2,5 @@
 forceload remove 1001 4000 1075 4025
 
 # 清理锁定格子
-execute as @a run function item:disable_slot/disable_slot_7
-execute as @a run function item:disable_slot/disable_slot_8
+execute as @a[team=!debugging] run function item:disable_slot/disable_slot_7
+execute as @a[team=!debugging] run function item:disable_slot/disable_slot_8

+ 1 - 1
data/mini/functions/diamond/game_init.mcfunction

@@ -6,7 +6,7 @@ scoreboard players set $finish_mode mem 0
 scoreboard players set $survival mem 1
 
 # 调整时间
-time set 9000t
+time set 8600t
 
 # 生成地图
 setblock 1000 255 5000 minecraft:structure_block[mode=load]{metadata:"",mirror:"NONE",ignoreEntities:1b,powered:0b,seed:0L,author:"LTCat",rotation:"NONE",posX:0,mode:"LOAD",posY:-24,sizeX:32,posZ:0,integrity:1.0f,showair:0b,name:"mini:diamond_base",sizeY:25,sizeZ:32,showboundingbox:1b}

+ 3 - 3
data/mini/functions/hotpm/game/pm_give.mcfunction

@@ -1,8 +1,8 @@
 # 计算权重
 scoreboard players reset @a temp
-execute as @a run scoreboard players operation @s temp = @s mini_heart
-execute as @a run scoreboard players operation @s temp *= #const_100 mem
-execute as @a run scoreboard players operation @s temp += @s total_score_disp
+execute as @a[team=!debugging] run scoreboard players operation @s temp = @s mini_heart
+execute as @a[team=!debugging] run scoreboard players operation @s temp *= #const_100 mem
+execute as @a[team=!debugging] run scoreboard players operation @s temp += @s total_score_disp
 scoreboard players add @a[tag=!pm_explode_last] temp 10000
 
 # 寻找最高分

+ 2 - 2
data/mini/functions/phantom/game_end.mcfunction

@@ -6,5 +6,5 @@ gamerule doDaylightCycle false
 execute as @a[team=playing] run scoreboard players operation @s mini_score = @s kill_phantom
 
 # 清理锁定格子
-execute as @a run function item:disable_slot/disable_slot_7
-execute as @a run function item:disable_slot/disable_slot_8
+execute as @a[team=!debugging] run function item:disable_slot/disable_slot_7
+execute as @a[team=!debugging] run function item:disable_slot/disable_slot_8

+ 1 - 1
data/mini/functions/tntrun/player_enter3.mcfunction

@@ -1,2 +1,2 @@
 # 让玩家可以触发地板掉落
-tag @a add tntrun_pc
+tag @a[team=!debugging] add tntrun_pc

+ 1 - 1
data/test/functions/mini/diamond.mcfunction

@@ -1,6 +1,6 @@
 # 测试用:快速开始钻石风暴
 team join playing @a[team=watching]
-clear @a
+clear @a[team=!debugging]
 function ltw:state/0/start_game
 scoreboard players set $round mem 5
 scoreboard players set $mini_type mem 6