summaryrefslogtreecommitdiff
path: root/snowbrawl.py
diff options
context:
space:
mode:
authorPanFritz <redstonenoobpan@gmail.com>2015-06-29 22:47:06 +0200
committerPanFritz <redstonenoobpan@gmail.com>2015-06-29 22:47:06 +0200
commit72723840ed38f3c3678952661462e599a630e410 (patch)
treed59b179db0cfd26794159dcfb78734c64d9380c6 /snowbrawl.py
parent474ce0b310d821755417c73fe6a3ce2a16032078 (diff)
Fixed indentation
Diffstat (limited to 'snowbrawl.py')
-rw-r--r--snowbrawl.py33
1 files changed, 14 insertions, 19 deletions
diff --git a/snowbrawl.py b/snowbrawl.py
index b8982f8..8da7d35 100644
--- a/snowbrawl.py
+++ b/snowbrawl.py
@@ -380,7 +380,7 @@ class Arena(object):
for subdata in data["clicks"]:
self.sign_click.append(NamedCoords(None, None).load(subdata))
self.name = data["name"]
- return self
+ return self
#coord = an instance of Coords class, adds a name to it.
class NamedCoords(object):
@@ -416,14 +416,14 @@ class NamedCoords(object):
class Coords(object):
def __init__(self, world = None, x = None, y = None, z = None, yaw = None, pitch = None):
- if world == None:
- self.world = None
- self.x = None
- self.y = None
- self.z = None
- self.yaw = None
- self.pitch = None
- return
+ if world == None:
+ self.world = None
+ self.x = None
+ self.y = None
+ self.z = None
+ self.yaw = None
+ self.pitch = None
+ return
if not isinstance(world, Location):
self.x = x
self.y = y
@@ -497,10 +497,10 @@ class Queue(object):
self.queue.remove(args)
#Check if queue contains player
- def contains(self, player):
- if player in self.queue:
- return True
- return False
+ def contains(self, player):
+ if player in self.queue:
+ return True
+ return False
def clear(self):
self.queue = []
@@ -607,12 +607,6 @@ def onHit(event):
@hook.event("player.PlayerInteractEvent", "high")
def onClick(event):
- try:
- bleh(event)
- except:
- print trace()
-
-def bleh(event):
if event.getPlayer().getWorld().getName() != "minigames":
return
if str(event.getAction()) != "RIGHT_CLICK_BLOCK":
@@ -626,6 +620,7 @@ def bleh(event):
inv.setItemInHand(ItemStack(Material.SNOW_BALL, arena.get_refill()))
event.getPlayer().updateInventory()
break
+
elif isinstance(block, bukkit.block.Sign):
line = str(block.getLine(1))
if not event.getPlayer().hasPermission(join_perm):