Merge branch 'release/v1.1.1-mc1.13'

xmamo · Jul 20, 2018 · 548b891 · 548b891
2 parents 3365919 + 528729d
commit 548b891
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/data/b7s/functions/config/tp_req/set_persist.mcfunction b/data/b7s/functions/config/tp_req/set_persist.mcfunction
@@ -12,5 +12,5 @@
 # /scoreboard players set @s b7s.val (0|1)
 # /function b7s:config/tp_req/set_persist
 
-execute if score @s b7s.val matches 2147483648.. if score @s b7s.val matches 0 run scoreboard players set #b7s.persist_tpreq b7s.val 0
-execute if score @s b7s.val matches 2147483648.. unless score @s b7s.val matches 0 run scoreboard players set #b7s.persist_tpreq b7s.val 1
+execute if score @s b7s.val matches -2147483648.. if score @s b7s.val matches 0 run scoreboard players set #b7s.persist_tpreq b7s.val 0
+execute if score @s b7s.val matches -2147483648.. unless score @s b7s.val matches 0 run scoreboard players set #b7s.persist_tpreq b7s.val 1
diff --git a/data/b7s/functions/world/set_daytime.mcfunction.py b/data/b7s/functions/world/set_daytime.mcfunction.py
@@ -27,5 +27,5 @@
 print()
 
 for i in range(14, -1, -1):
-	print('execute if score @s b7s._tmp_1 matches {}.. run time add {}'.format(2 ** i, 2** i))
-	print('execute if score @s b7s._tmp_1 matches {}.. run scoreboard players remove @s b7s._tmp_1 {}'.format(2 ** i, 2** i))
+	print('execute if score @s b7s._tmp_1 matches {}.. run time add {}'.format(2 ** i, 2 ** i))
+	print('execute if score @s b7s._tmp_1 matches {}.. run scoreboard players remove @s b7s._tmp_1 {}'.format(2 ** i, 2 ** i))
diff --git a/render.py b/render.py
@@ -8,7 +8,7 @@
 	for script in file.parent.glob('**/*.py'):
 		if script != file and script.suffixes == ['.mcfunction', '.py']:
 			mcfunction = script.with_suffix('')
-			print('Rendering {}...'.format(str(mcfunction)), end = '')
+			print('Rendering {}...'.format(str(mcfunction)), end='')
 			with mcfunction.open('w') as f:
-				subprocess.run([sys.executable, str(script)], stdout = f)
+				subprocess.run([sys.executable, str(script)], stdout=f)
 			print(' DONE')