Revert "修改实体清理时间为阶段切换后"

This reverts commit e52c2644240c6026233e5c130031d1eee07f03c0.

data/ltw/functions/state/6/generate_bonus.mcfunction

@@ -1,4 +1,10 @@
 # 生成奖励物品
+
+# 清理残余实体
+kill @e[type=item]
+kill @e[type=arrow]
+kill @e[type=trident]
+
 # 生成 玩家数+1 个奖励
 execute store result score #bonus_count mem if entity @a[team=playing]
 scoreboard players add #bonus_count mem 1

data/ltw/functions/state/7/continue_gameparty.mcfunction

@@ -4,6 +4,5 @@ function lib:bossbar/show
 
 # 继续下一轮小游戏
 scoreboard players add $round mem 1
-function ltw:state/7/state_end
 schedule function ltw:state/3/state_enter 2t replace
 forceload remove 0 1900 50 2000

data/ltw/functions/state/7/state_end.mcfunction

@@ -1,4 +0,0 @@
-# 清理残余实体
-kill @e[type=item]
-kill @e[type=arrow]
-kill @e[type=trident]

data/mini/functions/ass/game_end.mcfunction

@@ -1,4 +1,2 @@
-# 清理残余实体
-function mini:main/kill_entity
 # 结束刺客
 forceload remove 1000 7000 1032 7032

data/mini/functions/ass/game_init.mcfunction

@@ -10,6 +10,9 @@ setblock 1000 4 7000 minecraft:structure_block[mode=load]{mode:"LOAD",posX:0,pos
 setblock 1000 5 7000 minecraft:redstone_block
 setblock 1000 4 7000 air
 
+# 清理残余实体
+function mini:main/kill_entity
+
 # 伤害管理
 scoreboard players set $remove_resistance mem 1
 team modify playing friendlyFire false

data/mini/functions/colormatch/game_end.mcfunction

@@ -1,4 +1,2 @@
-# 清理残余实体
-function mini:main/kill_entity
 # 当前游戏结束时触发
 forceload remove 1001 4000 1075 4025

data/mini/functions/colormatch/game_init.mcfunction

@@ -13,6 +13,9 @@ scoreboard players set $color_match_type mem 0
 function mini:colormatch/game/prepare_round
 schedule function mini:colormatch/game_init2 12t replace
 
+# 清理残余实体
+function mini:main/kill_entity
+
 # 生成物品
 execute positioned 1060.5 22.0 4010.5 run function item:bonus_item/gameparty/auto/white
 

data/mini/functions/diamond/game_end.mcfunction

@@ -1,7 +1,3 @@
-# 清理残余实体
-tp @e[type=!player,x=950,y=-200,z=4950,dx=100,dy=600,dz=100] ~ -100 ~
-kill @e[type=!player,x=950,y=-200,z=4950,dx=100,dy=600,dz=100]
-
 # 游戏结束
 forceload remove 1000 5000 1064 5064
 worldborder set 1000000

data/mini/functions/diamond/game_init.mcfunction

@@ -13,6 +13,10 @@ setblock 1000 255 5000 minecraft:structure_block[mode=load]{metadata:"",mirror:"
 setblock 1000 255 5001 redstone_block
 schedule function mini:diamond/game_init2 1t append
 
+# 清理残余实体
+tp @e[type=!player,x=950,y=-200,z=4950,dx=100,dy=600,dz=100] ~ -100 ~
+kill @e[type=!player,x=950,y=-200,z=4950,dx=100,dy=600,dz=100]
+
 # 伤害管理
 scoreboard players set $remove_resistance mem 1
 team modify playing friendlyFire true

data/mini/functions/hotpm/game_end.mcfunction

@@ -1,7 +1,3 @@
-
-# 清理残余实体
-function mini:main/kill_entity
-# 分数结算
 scoreboard players add @a[tag=mini_running] surviveRound 1
 execute as @a[team=playing] run scoreboard players operation @s mini_score = @s surviveRound
 # 结束热土豆

data/mini/functions/hotpm/game_init.mcfunction

@@ -1,7 +1,6 @@
 # 初始化热土豆地图
 forceload add 1000 3000 1100 3100
 
-# 初始化计分板
 scoreboard players set $finish_mode mem 0
 scoreboard players set $survival mem 0
 scoreboard players reset * surviveRound
@@ -13,7 +12,12 @@ team modify playing collisionRule always
 team modify playing deathMessageVisibility never
 gamerule fallDamage false
 
+# 清理残余实体
+function mini:main/kill_entity
+
+
 # 生成地图
+
 setblock 1000 4 3000 air
 setblock 1000 4 3000 minecraft:structure_block[mode=load]{metadata:"",mirror:"NONE",ignoreEntities:1b,powered:0b,seed:0L,rotation:"NONE",posX:0,mode:"LOAD",posY:1,sizeX:32,posZ:0,integrity:1.0f,showair:0b,name:"mini:hp",sizeY:15,sizeZ:30,showboundingbox:0b}
 setblock 1000 5 3000 minecraft:redstone_block

data/mini/functions/parkour/game_end.mcfunction

@@ -1,8 +1,3 @@
-# 清理残余实体
-kill @e[type=falling_block,tag=parkour_block]
-kill @e[tag=treasure_item]
-function mini:main/kill_entity
-
 # 结束跑酷
 forceload remove 1000 1000 1064 1064
 

data/mini/functions/parkour/game_init.mcfunction

@@ -15,6 +15,12 @@ setblock 1000 5 1032 minecraft:redstone_block
 setblock 1000 4 1000 air
 setblock 1000 4 1032 air
 
+# 清理残余实体
+kill @e[type=falling_block,tag=parkour_block]
+kill @e[tag=treasure_item]
+function mini:main/kill_entity
+
+
 # 生成节奏方块实体
 function mini:parkour/game/marker_spawn
 

data/mini/functions/phantom/game_end.mcfunction

@@ -1,9 +1,3 @@
-
-# 清理残余实体
-function mini:main/kill_entity
-tp @e[type=phantom] 1000 -100 6000
-kill @e[type=phantom]
-
 # 游戏结束
 forceload remove 1000 6000 1064 6064
 gamerule doDaylightCycle false

data/mini/functions/phantom/game_init.mcfunction

@@ -23,6 +23,10 @@ setblock 1000 4 6032 air
 setblock 1032 4 6000 air
 setblock 1032 4 6032 air
 
+# 清理残余实体
+function mini:main/kill_entity
+tp @e[type=phantom] 1000 -100 6000
+
 # 生成奖励物品
 execute positioned 1034.0 27.5 6058.5 run function item:bonus_item/gameparty/auto/white
 execute positioned 1035.0 28.5 6002.5 run function item:bonus_item/gameparty/auto/white

data/mini/functions/tntrun/game_end.mcfunction

@@ -1,7 +1,3 @@
-# 清理残余实体
-function mini:main/kill_entity
-kill @e[tag=tntrun_block]
-
 # 结束 TNT Run
 forceload remove 1000 2000 1050 2050
 

data/mini/functions/tntrun/game_init.mcfunction

@@ -32,6 +32,9 @@ setblock 1032 51 2000 minecraft:redstone_block
 setblock 1032 52 2032 minecraft:structure_block[mode=load]{metadata:"",mirror:"NONE",ignoreEntities:1b,powered:0b,seed:0L,author:"chengzi_SC",rotation:"NONE",posX:0,mode:"LOAD",posY:-10,sizeX:9,posZ:0,integrity:1.0f,showair:0b,name:"mini:tntrun111",sizeY:10,sizeZ:8,showboundingbox:0b}
 setblock 1032 51 2032 minecraft:redstone_block
 
+# 清理残余实体
+function mini:main/kill_entity
+kill @e[tag=tntrun_block]
 
 # 生成奖励
 execute positioned 1019.5 19.2 2020.5 run function item:bonus_item/gameparty/auto/white

data/mini/functions/trade/game_end.mcfunction

@@ -1,7 +1,3 @@
-# 清理残余实体
-tp @e[type=!player,x=950,y=-200,z=4950,dx=100,dy=600,dz=100] ~ -100 ~
-kill @e[type=!player,x=950,y=-200,z=4950,dx=100,dy=600,dz=100]
-
 # 游戏结束
 forceload remove 1000 5000 1064 5064
 worldborder set 1000000

data/mini/functions/trade/game_init.mcfunction

@@ -14,6 +14,10 @@ setblock 1000 255 5000 minecraft:structure_block[mode=load]{metadata:"",mirror:"
 setblock 1000 255 5001 redstone_block
 schedule function mini:trade/game_init2 1t append
 
+# 清理残余实体
+tp @e[type=!player,x=950,y=-200,z=4950,dx=100,dy=600,dz=100] ~ -100 ~
+kill @e[type=!player,x=950,y=-200,z=4950,dx=100,dy=600,dz=100]
+
 # 伤害管理
 scoreboard players set $remove_resistance mem 1
 team modify playing friendlyFire false