HerobrineXia 5 лет назад
Родитель
Сommit
9042fc1cab

+ 3 - 3
data/mini/functions/ass/game/give_creeper.mcfunction

@@ -1,7 +1,7 @@
 clear @s creeper_spawn_egg{game_item:1b}
 
 # 返还格子上的物品
-execute if data entity @s Inventory[{Slot:8b}] run scoreboard players set @s item_slot 8
-execute if data entity @s Inventory[{Slot:8b}] at @s run function item:pop_slot/return_item
+execute if data entity @s Inventory[{Slot:-106b}] run scoreboard players set @s item_slot -106
+execute if data entity @s Inventory[{Slot:-106b}] at @s run function item:pop_slot/return_item
 
-replaceitem entity @s hotbar.8 creeper_spawn_egg{game_item:1b,display:{Name:'{"text":"苦力怕刷怪蛋","italic":false}'},EntityTag:{ignited:1b,Fuse:30s,AbsorptionAmount:1000},CanPlaceOn:["#mini:creeper_block"]} 1
+replaceitem entity @s weapon.offhand creeper_spawn_egg{game_item:1b,display:{Name:'{"text":"苦力怕刷怪蛋","italic":false}'},EntityTag:{ignited:1b,Fuse:30s,AbsorptionAmount:1000},CanPlaceOn:["#mini:creeper_block"],HideFlags:16} 1

+ 3 - 3
data/mini/functions/ass/game/give_stick.mcfunction

@@ -1,7 +1,7 @@
 clear @s stick{game_item:1b}
 
 # 返还格子上的物品
-execute if data entity @s Inventory[{Slot:7b}] run scoreboard players set @s item_slot 7
-execute if data entity @s Inventory[{Slot:7b}] at @s run function item:pop_slot/return_item
+execute if data entity @s Inventory[{Slot:8b}] run scoreboard players set @s item_slot 8
+execute if data entity @s Inventory[{Slot:8b}] at @s run function item:pop_slot/return_item
 
-replaceitem entity @s hotbar.7 stick{game_item:1b,display:{Name:'{"text":"击退棒","italic":false}'},Enchantments:[{id:"knockback",lvl:2}]} 1
+replaceitem entity @s hotbar.8 stick{game_item:1b,display:{Name:'{"text":"击退棒","italic":false}'},Enchantments:[{id:"knockback",lvl:2}]} 1

+ 1 - 0
data/mini/functions/ass/game_init.mcfunction

@@ -18,5 +18,6 @@ scoreboard players set $remove_resistance mem 1
 team modify playing friendlyFire false
 team modify playing collisionRule always
 team modify playing deathMessageVisibility always
+gamerule naturalRegeneration false
 gamerule fallDamage false
 

+ 0 - 2
data/mini/functions/ass/player_enter.mcfunction

@@ -6,8 +6,6 @@ title @s actionbar ""
 # 状态效果
 effect clear @s
 effect give @s saturation 1000000 0 true
-gamerule naturalRegeneration true
-effect give @s resistance 1000000 4 true
 
 # 设置玩家生命
 attribute @s generic.max_health base set 20

+ 2 - 2
data/mini/functions/ass/tick2.mcfunction

@@ -2,7 +2,7 @@
 execute as @a[tag=mini_running] if score @s creeperUse matches 1.. run function mini:ass/game/use_creeper
 
 # 给予苦力怕刷怪蛋
-execute as @a[tag=mini_running] unless data entity @s Inventory[{Slot:8b,id:"minecraft:creeper_spawn_egg",tag:{game_item:1b}}] unless score @s countdown_fast matches 1.. run function mini:ass/game/give_creeper
+execute as @a[tag=mini_running] unless data entity @s Inventory[{Slot:-106b,id:"minecraft:creeper_spawn_egg",tag:{game_item:1b}}] unless score @s countdown_fast matches 1.. run function mini:ass/game/give_creeper
 
 # 给予击退棒
-execute as @a[tag=mini_running] unless data entity @s Inventory[{Slot:7b,id:"minecraft:stick",tag:{game_item:1b}}] run function mini:ass/game/give_stick
+execute as @a[tag=mini_running] unless data entity @s Inventory[{Slot:8b,id:"minecraft:stick",tag:{game_item:1b}}] run function mini:ass/game/give_stick

+ 1 - 1
data/mini/tags/blocks/creeper_block.json

@@ -1,7 +1,7 @@
 {
     "values": [
         "minecraft:clay",
-        "#minecraft:white_concrete",
+        "minecraft:white_concrete",
         "#minecraft:wool",
         "minecraft:diamond_block"
     ]