Added check for .

This commit is contained in:
PanFritz
2015-01-17 14:03:20 +01:00
parent c1a69c6a62
commit 9b4d73cfe2
2 changed files with 6 additions and 4 deletions

View File

@@ -1,7 +1,7 @@
from helpers import * from helpers import *
calc_users = open_json_file("calc", []) calc_users = open_json_file("calc", [])
math_operators = ["+", "-", "*", "/", "&", "|",".",] math_operators = ["+", "-", "*", "/", "&", "|"]
ignore_operators = ["**", "&&", "||"] # ** may be too intensive, the others cause syntax errors ignore_operators = ["**", "&&", "||"] # ** may be too intensive, the others cause syntax errors
calc_perm = "utils.calc" calc_perm = "utils.calc"
@@ -16,6 +16,8 @@ def calc(text):
for char in text: for char in text:
if char.isdigit() or (should_calc and char in [".", " "]): if char.isdigit() or (should_calc and char in [".", " "]):
expression += char expression += char
elif expression and char == ".":
expression += char
elif char in math_operators: elif char in math_operators:
# calculation must include at least 1 operator # calculation must include at least 1 operator
should_calc = True should_calc = True

View File

@@ -18,9 +18,9 @@ def onHit(event):
print (event.getEntity().getName()) print (event.getEntity().getName())
return return
print "passed first if statement" print "passed first if statement"
if event.getEntity().getWorld().getName() != "minigames": """if event.getEntity().getWorld().getName() != "minigames":
print "Not in minigames" print "Not in minigames"
return return"""
print "all good." print "all good."
event.getEntity().getWorld().createExplosion(event.getEntity().getLocation().getX(), event.getEntity().getLocation().getY(),event.getEntity().getLocation().getZ(),float(5),False,True) event.getEntity().getWorld().createExplosion(event.getEntity().getLocation().getX(), event.getEntity().getLocation().getY(),event.getEntity().getLocation().getZ(),float(5),False,True)