Moving files to better spots and adding 1.1.0 hotfix

dvdcd · Dec 24, 2018 · 45c8495 · 45c8495
1 parent 2bcd447
commit 45c8495
Show file tree

Hide file tree

Showing 15 changed files with 2 additions and 1 deletion.
diff --git a/warpbook-pack/bookcode.txt → bookcode.txt b/warpbook-pack/bookcode.txt → bookcode.txt
diff --git a/...k/data/main/functions/cooldown.mcfunction → data/main/functions/cooldown.mcfunction b/...k/data/main/functions/cooldown.mcfunction → data/main/functions/cooldown.mcfunction
diff --git a/...k/data/main/functions/givebook.mcfunction → data/main/functions/givebook.mcfunction b/...k/data/main/functions/givebook.mcfunction → data/main/functions/givebook.mcfunction
diff --git a/...-pack/data/main/functions/init.mcfunction → data/main/functions/init.mcfunction b/...-pack/data/main/functions/init.mcfunction → data/main/functions/init.mcfunction
diff --git a/...ack/data/main/functions/master.mcfunction → data/main/functions/master.mcfunction b/...ack/data/main/functions/master.mcfunction → data/main/functions/master.mcfunction
@@ -6,7 +6,8 @@
 scoreboard players add #tick tick 1
 scoreboard players enable @a warpbook
 scoreboard players enable @a warpupdatet
-execute as @a unless score @s warpupdate matches 1 run scoreboard players set @s warpupdate 0 
+execute at @a unless score @s warpbook matches 1.. run scoreboard players set @s warpcooldown 0
+execute as @a unless score @s warpupdate matches 1 run scoreboard players set @s warpupdate 0
 execute as @a if score @s warpupdatet matches 1 run function main:update
 #Run the main warping command if a player has pushed the book button
 execute as @a if score @s warpbook matches 1.. run function main:warp

diff --git a/...ata/main/functions/resetupdate.mcfunction → data/main/functions/resetupdate.mcfunction b/...ata/main/functions/resetupdate.mcfunction → data/main/functions/resetupdate.mcfunction
diff --git a/...ack/data/main/functions/second.mcfunction → data/main/functions/second.mcfunction b/...ack/data/main/functions/second.mcfunction → data/main/functions/second.mcfunction
diff --git a/...ok-pack/data/main/functions/tp.mcfunction → data/main/functions/tp.mcfunction b/...ok-pack/data/main/functions/tp.mcfunction → data/main/functions/tp.mcfunction
diff --git a/...ack/data/main/functions/update.mcfunction → data/main/functions/update.mcfunction b/...ack/data/main/functions/update.mcfunction → data/main/functions/update.mcfunction
diff --git a/...-pack/data/main/functions/warp.mcfunction → data/main/functions/warp.mcfunction b/...-pack/data/main/functions/warp.mcfunction → data/main/functions/warp.mcfunction
diff --git a/...k-pack/data/main/tags/functions/init.json → data/main/tags/functions/init.json b/...k-pack/data/main/tags/functions/init.json → data/main/tags/functions/init.json
diff --git a/...pack/data/main/tags/functions/second.json → data/main/tags/functions/second.json b/...pack/data/main/tags/functions/second.json → data/main/tags/functions/second.json
diff --git a/...k/data/minecraft/tags/functions/load.json → data/minecraft/tags/functions/load.json b/...k/data/minecraft/tags/functions/load.json → data/minecraft/tags/functions/load.json
diff --git a/...k/data/minecraft/tags/functions/tick.json → data/minecraft/tags/functions/tick.json b/...k/data/minecraft/tags/functions/tick.json → data/minecraft/tags/functions/tick.json
diff --git a/warpbook-pack/pack.mcmeta → pack.mcmeta b/warpbook-pack/pack.mcmeta → pack.mcmeta