Fix custom durability over normal durability

ICY105 · Jul 7, 2021 · 75bba56 · 75bba56
1 parent 1d01ecb
commit 75bba56
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/data/du/advancements/base.json b/data/du/advancements/base.json
@@ -1,7 +1,7 @@
 {
 	"display": {
 		"title": "Datapack Utils",
-		"description": "v2.3.0",
+		"description": "v2.3.1",
 		"icon": {
 			"item": "minecraft:redstone"
 		},

diff --git a/data/du/functions/load.mcfunction b/data/du/functions/load.mcfunction
@@ -14,7 +14,7 @@ scoreboard objectives add pregen_radius trigger
 #version
 scoreboard players set $du.ver.major load.status 2
 scoreboard players set $du.ver.minor load.status 3
-scoreboard players set $du.ver.fix load.status 0
+scoreboard players set $du.ver.fix load.status 1
 
 #Team Data
 team add du_nopush

diff --git a/data/du/functions/load_message.mcfunction b/data/du/functions/load_message.mcfunction
@@ -6,5 +6,5 @@ scoreboard players set $install du_data 1
 execute store result score $minecraft.version du_data run data get entity @p DataVersion
 
 #verify minecraft version
-execute unless score $minecraft.version du_data matches 2724.. run scoreboard players set $install du_data 0
-execute unless score $minecraft.version du_data matches 2724.. run tellraw @a [{"color":"red","text":"Error: Datapack Utils v"},{"score":{"name":"$du.ver.major","objective":"load.status"}},{"text":"."},{"score":{"name":"$du.ver.minor","objective":"load.status"}},{"text":"."},{"score":{"name":"$du.ver.fix","objective":"load.status"}},{"text":" requires Minecraft 1.17. Click [here] to go to the DU download page for alternate releases.","clickEvent":{"action":"open_url","value":"https://github.com/ImCoolYeah105/Datapack-Utilities/releases"}}]
+execute unless score $minecraft.version du_data matches 2730.. run scoreboard players set $install du_data 0
+execute unless score $minecraft.version du_data matches 2730.. run tellraw @a [{"color":"red","text":"Error: Datapack Utils v"},{"score":{"name":"$du.ver.major","objective":"load.status"}},{"text":"."},{"score":{"name":"$du.ver.minor","objective":"load.status"}},{"text":"."},{"score":{"name":"$du.ver.fix","objective":"load.status"}},{"text":" requires Minecraft +1.17.1. Click [here] to go to the DU download page for alternate releases.","clickEvent":{"action":"open_url","value":"https://github.com/ImCoolYeah105/Datapack-Utilities/releases"}}]
diff --git a/data/du/functions/player/durability/change_durability.mcfunction b/data/du/functions/player/durability/change_durability.mcfunction
@@ -12,7 +12,7 @@ function du:player/durability/get_max_durability
 scoreboard players operation $player.temp_1 du_data -= $player.temp_2 du_data
 scoreboard players operation $player.temp_0 du_data += $player.temp_1 du_data
 scoreboard players operation $player.temp_1 du_data += $player.temp_2 du_data
-execute if score $player.temp_4 du_data matches 1.. if score $player.temp_0 du_data > $player.temp_4 du_data run scoreboard players operation $player.temp_0 du_data = $player.temp_4 du_data
+execute if score $player.temp_4 du_data matches 1.. if score $player.temp_0 du_data > $player.temp_3 du_data run scoreboard players operation $player.temp_0 du_data = $player.temp_3 du_data
 execute if score $player.temp_0 du_data matches ..-1 run scoreboard players set $player.temp_0 du_data -1
 execute if score $player.temp_4 du_data matches 1.. store result storage du:temp object.tag.du_dur.dur int 1 run scoreboard players get $player.temp_0 du_data
 
@@ -26,7 +26,7 @@ scoreboard players operation $player.temp_4 du_data -= $player.temp_5 du_data
 
 execute if score $player.temp_4 du_data matches 1.. if score $player.temp_4 du_data > $player.temp_6 du_data run scoreboard players operation $player.temp_4 du_data = $player.temp_6 du_data
 execute if score $player.temp_4 du_data matches 1.. store result storage du:temp object.tag.Damage int 1 run scoreboard players get $player.temp_4 du_data
-execute if score $player.temp_4 du_data matches 1.. store result storage du:temp object.tag.du_dur.damage int 1 run data get storage du:temp object.tag.Damage
+execute if score $player.temp_4 du_data matches 1.. store result storage du:temp object.tag.du_dur.damage int 1 run scoreboard players get $player.temp_4 du_data
 
 #change durability of unbreakable items
 execute if score $player.temp_4 du_data matches 0 store result score $player.temp_0 du_data run data get storage du:temp object.tag.du_dur.dur