pmtoggle works now, Fixes comments by Jomo

BTW: I didn't use retrieve_player as it gets an Offline player which
makes it slower and I know the player is online. That's why I used
Bukkit.getPlayer(juuid(uuidstring)). (line 40)
This commit is contained in:
Dico200
2015-03-15 02:16:30 +01:00
parent 43a8ec9481
commit 9a3942c034
+20 -15
View File
@@ -1,13 +1,14 @@
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 traceback import format_exc as print_traceback
toggle_list = {} toggle_dict = {}
permission = "utils.pmtoggle" permission = "utils.pmtoggle"
@hook.command("tm") @hook.command("tm")
def on_toggle_message_command(sender, args): def on_toggle_message_command(sender, args):
name = sender.getName() if not sender.hasPermission(permission) or not is_player(sender):
if not sender.hasPermission(permission) or name == "CONSOLE":
noperm(sender) noperm(sender)
return True return True
plugin_header(sender, "Private Message Toggle") plugin_header(sender, "Private Message Toggle")
@@ -18,34 +19,38 @@ def on_toggle_message_command(sender, args):
return True return True
target = Bukkit.getPlayer(args[0]) target = Bukkit.getPlayer(args[0])
if target: if target:
toggle_list[uuid] = uid(target) toggle_dict[uuid] = uid(target)
msg(sender, "&2Enabled toggle so that you're now sending only to %s &2by default" % target.getDisplayName()) msg(sender, "&2Enabled toggle so that you're now sending only to %s &2by default" % target.getDisplayName())
else: else:
msg(sender, "&cThat player could not be found") msg(sender, "&cThat player could not be found")
else if uuid in toggle_list: elif uuid in toggle_dict:
del toggle_list[uuid] del toggle_dict[uuid]
msg(sender, "&2Disabled toggle successfully") msg(sender, "&2Disabled toggle successfully")
else: else:
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_list: if uuid in toggle_dict:
try:
event.setCancelled(True) event.setCancelled(True)
target = Bukkit.getPlayer(toggle_list[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")
def on_quit(event): def on_quit(event):
uuid = uid(event.getPlayer()) uuid = uid(event.getPlayer())
if uuid in toggle_list: if uuid in toggle_dict:
del toggle_list[uuid] del toggle_dict[uuid]
for pid in toggle_list: for pid in toggle_dict:
if toggle_list[pid] == uuid: if toggle_dict[pid] == uuid:
del toggle_list[pid] del toggle_dict[pid]
msg(Bukkit.getPlayer(pid), "%s &cwent off so your Private Message Toggle has been disabled!" % Bukkit.getPlayer(uuid).getDisplayName()) msg(Bukkit.getPlayer(pid), "%s &cwent off so your Private Message Toggle has been disabled!" % Bukkit.getPlayer(uuid).getDisplayName())