This commit is contained in:
延皓 2021-07-03 09:22:22 +08:00
parent 17676af50f
commit d5ac52d30c
3 changed files with 55 additions and 0 deletions

View File

@ -0,0 +1,48 @@
{
"criteria": {
"tools_hit_entities": {
"trigger": "minecraft:player_hurt_entity",
"conditions": {
"player": [
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"items": [
"iron_axe",
"stone_axe",
"golden_axe",
"wooden_axe",
"diamond_axe",
"netherite_axe",
"iron_shovel",
"stone_shovel",
"golden_shovel",
"wooden_shovel",
"diamond_shovel",
"netherite_shovel",
"iron_hoe",
"stone_hoe",
"golden_hoe",
"wooden_hoe",
"diamond_hoe",
"netherite_hoe",
"iron_pickaxe",
"stone_pickaxe",
"golden_pickaxe",
"wooden_pickaxe",
"diamond_pickaxe",
"netherite_pickaxe"
]
}
}
}
}
]
}
}
},
"rewards": {"function": "fz:scoreboards/digcounter/toolsfix2"}
}

View File

@ -10,6 +10,7 @@ advancement revoke @s only fz:scoreboards/killcounter
advancement revoke @s only fz:scoreboards/tradingcounter advancement revoke @s only fz:scoreboards/tradingcounter
advancement revoke @s only fz:scoreboards/digcounter/digtrigger advancement revoke @s only fz:scoreboards/digcounter/digtrigger
advancement revoke @s only fz:scoreboards/digcounter/toolsfix advancement revoke @s only fz:scoreboards/digcounter/toolsfix
advancement revoke @s only fz:scoreboards/digcounter/toolsfix2
advancement revoke @s only fz:config/sneak advancement revoke @s only fz:config/sneak
advancement revoke @s only fz:config/unsneak advancement revoke @s only fz:config/unsneak

View File

@ -0,0 +1,6 @@
#为digtrigger函数修正非挖掘的使用带来的加分(使用工具攻击实体)
#判断条件用于排除地毯小人
execute unless score @s carpetBot matches 1 run scoreboard players remove @s digCounter 1
execute unless score @s carpetBot matches 1 run scoreboard players remove 总挖掘量 digCounter 1
execute unless score @s carpetBot matches 1 run scoreboard players remove 总挖掘量 totalList 1
advancement revoke @s only fz:scoreboards/digcounter/toolsfix2