Remove redundant try/except in Pmtoggle module

This commit is contained in:
Dico200
2015-03-15 02:18:02 +01:00
parent 9a3942c034
commit 5a669893b4

View File

@@ -1,7 +1,6 @@
from helpers import * from helpers import *
import org.bukkit.Bukkit as Bukkit import org.bukkit.Bukkit as Bukkit
from java.util.UUID import fromString as juuid from java.util.UUID import fromString as juuid
from traceback import format_exc as print_traceback
toggle_dict = {} toggle_dict = {}
permission = "utils.pmtoggle" permission = "utils.pmtoggle"
@@ -30,18 +29,15 @@ def on_toggle_message_command(sender, args):
msg(sender, "&cExpected a player as argument") msg(sender, "&cExpected a player as argument")
return True return True
@hook.event("player.AsyncPlayerChatEvent", "normal") @hook.event("player.AsyncPlayerChatEvent", "normal")
def on_chat(event): def on_chat(event):
player = event.getPlayer() player = event.getPlayer()
uuid = uid(player) uuid = uid(player)
if uuid in toggle_dict: if uuid in toggle_dict:
try: event.setCancelled(True)
event.setCancelled(True) target = Bukkit.getPlayer(juuid(toggle_dict[uuid])).getName()
target = Bukkit.getPlayer(juuid(toggle_dict[uuid])).getName() runas(player, "msg %s %s" % (target, event.getMessage()))
runas(player, "msg %s %s" % (target, event.getMessage()))
except:
info(print_traceback())
@hook.event("player.PlayerQuitEvent", "normal") @hook.event("player.PlayerQuitEvent", "normal")