起床战争cd修复

wifi-left · Nov 3, 2022 · 61a1351 · 61a1351
1 parent ab063b5
commit 61a1351
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/second.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/second.mcfunction
@@ -13,7 +13,7 @@ effect give @a[tag=bw.fasti] haste 2 0 true
 effect give @a[tag=bw.fastii] haste 2 1 true
 effect give @a[tag=bw.armor] resistance 2 0 true
 effect give @a[tag=bw.speed] speed 2 0 true
-execute as @a[tag=bw.player] at @s run attribute @s minecraft:generic.attack_speed base set 8
+# execute as @a[tag=bw.player] at @s run attribute @s minecraft:generic.attack_speed base set 8
 ## Death
 scoreboard players remove @a[tag=bw.fhing] board 1
 execute as @a[tag=bw.fhing] if score @s board matches ..0 run function minecraft:bedwars/during/player/teleport

diff --git a/datapacks/viaversion_support_1_18/data/fix/functions/bw/armor.mcfunction b/datapacks/viaversion_support_1_18/data/fix/functions/bw/armor.mcfunction
@@ -6,10 +6,10 @@ give @a[scores={bw.pickaxe=1..1},nbt=!{Inventory:[{id:"minecraft:wooden_pickaxe"
 give @a[scores={bw.axe=1..1},nbt=!{Inventory:[{id:"minecraft:wooden_axe"}]}] wooden_axe{AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"noName",Amount:1d,Operation:0,UUID:[I;7777,8425,9963,3879]}],Enchantments:[{id:"minecraft:efficiency",lvl:1s}],Unbreakable:1b,bw:1,HideFlags:63,CanPlaceOn:["#minecraft:bwplace"],CanDestroy:["#minecraft:bedblocks"]}
 
 give @a[scores={bw.pickaxe=2..2},nbt=!{Inventory:[{id:"minecraft:iron_pickaxe"}]}] iron_pickaxe{Enchantments:[{id:"minecraft:efficiency",lvl:1s}],Unbreakable:1b,bw:1,HideFlags:63,CanPlaceOn:["#minecraft:bwplace"],CanDestroy:["#minecraft:bedblocks"]}
-give @a[scores={bw.axe=2..2},nbt=!{Inventory:[{id:"minecraft:iron_axe"}]}] iron_axe{AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"noName",Amount:5d,Operation:0,UUID:[I;7777,8425,9963,3879]}],Enchantments:[{id:"minecraft:efficiency",lvl:1s}],Unbreakable:1b,bw:1,HideFlags:63,CanPlaceOn:["#minecraft:bwplace"],CanDestroy:["#minecraft:bedblocks"]}
+give @a[scores={bw.axe=2..2},nbt=!{Inventory:[{id:"minecraft:iron_axe"}]}] iron_axe{AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"noName",Amount:2d,Operation:0,UUID:[I;7777,8425,9963,3879]}],Enchantments:[{id:"minecraft:efficiency",lvl:1s}],Unbreakable:1b,bw:1,HideFlags:63,CanPlaceOn:["#minecraft:bwplace"],CanDestroy:["#minecraft:bedblocks"]}
 
 give @a[scores={bw.pickaxe=3..3},nbt=!{Inventory:[{id:"minecraft:diamond_pickaxe"}]}] diamond_pickaxe{Enchantments:[{id:"minecraft:efficiency",lvl:1s}],Unbreakable:1b,bw:1,HideFlags:63,CanPlaceOn:["#minecraft:bwplace"],CanDestroy:["#minecraft:bedblocks"]}
-give @a[scores={bw.axe=3..3},nbt=!{Inventory:[{id:"minecraft:diamond_axe"}]}] diamond_axe{AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"noName",Amount:7d,Operation:0,UUID:[I;7777,8425,9963,3879]}],Enchantments:[{id:"minecraft:efficiency",lvl:1s}],Unbreakable:1b,bw:1,HideFlags:63,CanPlaceOn:["#minecraft:bwplace"],CanDestroy:["#minecraft:bedblocks"]}
+give @a[scores={bw.axe=3..3},nbt=!{Inventory:[{id:"minecraft:diamond_axe"}]}] diamond_axe{AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"noName",Amount:3d,Operation:0,UUID:[I;7777,8425,9963,3879]}],Enchantments:[{id:"minecraft:efficiency",lvl:1s}],Unbreakable:1b,bw:1,HideFlags:63,CanPlaceOn:["#minecraft:bwplace"],CanDestroy:["#minecraft:bedblocks"]}
 
 clear @a[scores={bw.pickaxe=..2},nbt=!{Inventory:[{id:"minecraft:diamond_pickaxe"}]}] diamond_pickaxe
 clear @a[scores={bw.axe=..2},nbt=!{Inventory:[{id:"minecraft:diamond_pickaxe"}]}] diamond_axe