Remove redundant try/catch

This commit is contained in:
Dico200
2015-03-18 22:26:54 +01:00
parent 194958f034
commit 9476a1b0b7

18
misc.py
View File

@@ -6,7 +6,6 @@ import thread
import org.bukkit.inventory.ItemStack as ItemStack import org.bukkit.inventory.ItemStack as ItemStack
import org.bukkit.Bukkit as Bukkit import org.bukkit.Bukkit as Bukkit
import org.bukkit.event.player.PlayerChatEvent as PlayerChatEvent import org.bukkit.event.player.PlayerChatEvent as PlayerChatEvent
from traceback import format_exc as trace
@hook.event("player.PlayerJoinEvent", "monitor") @hook.event("player.PlayerJoinEvent", "monitor")
@@ -78,16 +77,13 @@ def on_me_command(sender, args):
sender = server.getPlayer(sender.getName()) sender = server.getPlayer(sender.getName())
if not checkargs(sender, args, 1, -1): if not checkargs(sender, args, 1, -1):
return True return True
try: msg = " ".join(args)
msg = " ".join(args) event = PlayerChatEvent(sender, msg)
event = PlayerChatEvent(sender, msg) server.getPluginManager().callEvent(event)
server.getPluginManager().callEvent(event) if not event.isCancelled():
if not event.isCancelled(): msg = " %s %s7%s %s" % (sender.getDisplayName(), u"\u00A7", u"\u21E6", msg)
msg = " %s %s7%s %s" % (sender.getDisplayName(), u"\u00A7", u"\u21E6", msg) for player in list(Bukkit.getOnlinePlayers()):
for player in list(Bukkit.getOnlinePlayers()): player.sendMessage(msg)
player.sendMessage(msg)
except Exception, e:
error(trace())
return True return True