Redstoner/redstoner-utils
Archived
0
Fork 0
Code Issues 6 Pull Requests Wiki Activity

Added support for damnspam -1 time arguments

Browse Source
This commit is contained in:
shillingp
2014-12-19 23:28:33 +00:00
parent 74121f139c
commit 74dfdb580d
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
damnspam.py
View File

@@ -43,8 +43,10 @@ def on_dammnspam_command(sender, args):
try: try:
timeout_on = round(float(timeout_on), 2) timeout_on = round(float(timeout_on), 2)
timeout_off = timeout_on timeout_off = timeout_on
if not 0 <= timeout_on <= 60: if 60 >= timeout_on <= -2 or timeout_on == 0:
msg(sender, "&cThe timeout must be within 0-60.") timeout_on = False
if timeout_on == False:
msg(sender, "&cThe timeout must be within 0-60 or -1.")
return True return True
except ValueError: except ValueError:
msg(sender, "&cThe timeout must be a number") msg(sender, "&cThe timeout must be a number")
@@ -57,8 +59,12 @@ def on_dammnspam_command(sender, args):
try: try:
timeout_on = round(float(timeout_on), 2) timeout_on = round(float(timeout_on), 2)
timeout_off = round(float(timeout_off), 2) timeout_off = round(float(timeout_off), 2)
if not 0 <= timeout_on <= 60 or not 0 <= timeout_off <= 60: if 60 >= timeout_on <= -2 or timeout_on == 0:
msg(sender, "&cThe timeout must be within 0-60.") timeout_on = False
if 60 >= timeout_off <= -2 or timeout_off == 0:
timeout_off = False
if timeout_on == False or timeout_off == False:
msg(sender, "&cThe timeout must be within 0-60 or -1.")
return True return True
except ValueError: except ValueError:
msg(sender, "&cThe timeout must be a number") msg(sender, "&cThe timeout must be a number")
@@ -137,9 +143,13 @@ def on_interact(event):
data = inputs.get(pos_str) data = inputs.get(pos_str)
if data: if data:
checktime = data["timeout_on"] if powered else data["timeout_off"] checktime = data["timeout_on"] if powered else data["timeout_off"]
if data["last_time"] + checktime > now(): if checktime == -1:
event.setCancelled(True)
plugin_header(sender, "DamnSpam")
msg(sender, "&cThis %s is locked permanently." % (btype))
elif data["last_time"] + checktime > now():
event.setCancelled(True) event.setCancelled(True)
plugin_header(sender, "DamnSpam") plugin_header(sender, "DamnSpam")
msg(sender, "&cThis %s has a timeout of %ss." % (btype, checktime)) msg(sender, "&cThis %s has a timeout of %ss." % (btype, checktime))
else: else:
inputs[pos_str]["last_time"] = round(now(), 2) inputs[pos_str]["last_time"] = round(now(), 2)