summaryrefslogtreecommitdiff
path: root/utils.py
diff options
context:
space:
mode:
authorErik Schilling <ablu.erikschilling@gmail.com>2014-09-26 18:56:16 +0200
committerErik Schilling <ablu.erikschilling@gmail.com>2014-09-26 18:56:16 +0200
commita93b2573b8b04cf883dff0c75efa3f0630e3e79e (patch)
tree16044fb18ac1a8cefdec831961206910f20d0b61 /utils.py
parentaef0bcdbda77b07f6f99e629e0499d7e576b6741 (diff)
downloadmanamarket-a93b2573b8b04cf883dff0c75efa3f0630e3e79e.tar.gz
manamarket-a93b2573b8b04cf883dff0c75efa3f0630e3e79e.tar.bz2
manamarket-a93b2573b8b04cf883dff0c75efa3f0630e3e79e.tar.xz
manamarket-a93b2573b8b04cf883dff0c75efa3f0630e3e79e.zip
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).
Diffstat (limited to 'utils.py')
-rw-r--r--utils.py27
1 files changed, 6 insertions, 21 deletions
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 <yaypunkrock@gmail.com>
-Copyright 2011, Stefan Beller <stefanbeller@googlemail.com>
+ Copyright 2011, Dipesh Amin <yaypunkrock@gmail.com>
+ Copyright 2011, Stefan Beller <stefanbeller@googlemail.com>
-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 <http://www.gnu.org/licenses/>.
-
-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)