From a93b2573b8b04cf883dff0c75efa3f0630e3e79e Mon Sep 17 00:00:00 2001 From: Erik Schilling Date: Fri, 26 Sep 2014 18:56:16 +0200 Subject: Added changes done outside of git Those changes have been done on the server directly without continueing the git history (or at least since the history i know). --- utils.py | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) (limited to 'utils.py') diff --git a/utils.py b/utils.py index f911d43..07c4451 100644 --- a/utils.py +++ b/utils.py @@ -1,26 +1,10 @@ #!/usr/bin/python """ -Copyright 2011, Dipesh Amin -Copyright 2011, Stefan Beller + Copyright 2011, Dipesh Amin + Copyright 2011, Stefan Beller -This file is part of tradey, a trading bot in The Mana World -see www.themanaworld.org - -This program is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation; either version 2 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see . - -Additionally to the GPL, you are *strongly* encouraged to share any modifications -you do on these sources. + This file is part of tradey, a trading bot in the mana world + see www.themanaworld.org """ from xml.etree.ElementTree import ElementTree from player import Item @@ -128,9 +112,10 @@ class Broadcast: def send_broadcast(self): while self.Active: - if (time.time() - self.Timer) > 2 * 60: + if (time.time() - self.Timer) > 60: self.mapserv.sendall(emote(193)) self.Timer = time.time() + #print "shop_broadcast" else: time.sleep(0.1) -- cgit v1.2.3-70-g09d2