Redstoner/redstoner-utils
Archived
0
Fork 0
Code Issues 6 Pull Requests Wiki Activity

use uid(player) helper method

Browse Source
This commit is contained in:
jomo
2014-07-17 22:24:45 +02:00
parent ebf8a22bae
commit 8db6085d63
10 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -190,7 +190,7 @@ foo = int(player_data[str(server.getPlayer(args[4]).getUniqueId())]["details"].[
# good # good
player = server.getPlayer(args[4]) player = server.getPlayer(args[4])
player_id = str(player.getUniqueId()) player_id = uid(player)
logintime = player_data[played_id]["last_login"] logintime = player_data[played_id]["last_login"]
epoch_time = int(logintime.strftime("%s")) epoch_time = int(logintime.strftime("%s"))
``` ```

10
chatgroups.py
View File

@@ -18,7 +18,7 @@ except Exception, e:
def on_chatgroup_command(sender, args): def on_chatgroup_command(sender, args):
try: try:
plugin_header(sender, "ChatGroups") plugin_header(sender, "ChatGroups")
sender_id = str(sender.getUniqueId()) sender_id = uid(sender)
if len(args) == 1 and args[0] == "leave": if len(args) == 1 and args[0] == "leave":
if sender_id in groups.keys(): if sender_id in groups.keys():
groupchat(sender, "left the group", True) groupchat(sender, "left the group", True)
@@ -57,7 +57,7 @@ def on_chatgroup_command(sender, args):
@hook.command("cgt") @hook.command("cgt")
def on_cgt_command(sender, args): def on_cgt_command(sender, args):
p = str(sender.getUniqueId()) p = uid(sender)
if p in cg_toggle_list: if p in cg_toggle_list:
cg_toggle_list.remove(p) cg_toggle_list.remove(p)
msg(sender, "&8[&bCG&8] &e&oCG toggle: off") msg(sender, "&8[&bCG&8] &e&oCG toggle: off")
@@ -69,7 +69,7 @@ def on_cgt_command(sender, args):
def groupchat(sender, message, ann = False): def groupchat(sender, message, ann = False):
#try: #try:
group = groups.get(str(sender.getUniqueId())) group = groups.get(uid(sender))
if group == None: if group == None:
msg(sender, "&cYou are not in a group!") msg(sender, "&cYou are not in a group!")
return return
@@ -80,7 +80,7 @@ def groupchat(sender, message, ann = False):
mesg = "&8[&bCG&8] &f%s&f: &6%s" % (name, message) mesg = "&8[&bCG&8] &f%s&f: &6%s" % (name, message)
log("[ChatGroups] %s (%s): %s" % (sender, group, message)) log("[ChatGroups] %s (%s): %s" % (sender, group, message))
for receiver in server.getOnlinePlayers(): for receiver in server.getOnlinePlayers():
groups.get(str(receiver.getUniqueId())) == group and msg(receiver, mesg) groups.get(uid(receiver)) == group and msg(receiver, mesg)
#except Exception, e: #except Exception, e:
# error(e) # error(e)
@@ -99,7 +99,7 @@ def on_chat(event):
sender = event.getPlayer() sender = event.getPlayer()
msge = event.getMessage() msge = event.getMessage()
if not event.isCancelled(): if not event.isCancelled():
sender_id = str(sender.getUniqueId()) sender_id = uid(sender)
if msge[:len(cg_key)] == cg_key and sender_id in groups.keys(): if msge[:len(cg_key)] == cg_key and sender_id in groups.keys():
groupchat(sender, msge[1:]) groupchat(sender, msge[1:])
event.setCancelled(True) event.setCancelled(True)

4
cycle.py
View File

@@ -20,7 +20,7 @@ def on_cycler_command(sender, args):
return True return True
cmd = args[0].lower() cmd = args[0].lower()
pid = str(sender.getUniqueId()) pid = uid(sender)
nop = pid in no_cyclers nop = pid in no_cyclers
if cmd == "on": if cmd == "on":
if nop: if nop:
@@ -44,7 +44,7 @@ def on_cycler_command(sender, args):
@hook.event("player.PlayerItemHeldEvent", "normal") @hook.event("player.PlayerItemHeldEvent", "normal")
def on_slot_change(event): def on_slot_change(event):
player = event.getPlayer() player = event.getPlayer()
if is_creative(player) and str(player.getUniqueId()) not in no_cyclers and not player.isSneaking(): if is_creative(player) and uid(player) not in no_cyclers and not player.isSneaking():
prev_slot = event.getPreviousSlot() prev_slot = event.getPreviousSlot()
new_slot = event.getNewSlot() new_slot = event.getNewSlot()
if (prev_slot == 0 and new_slot == 8): # left -> right if (prev_slot == 0 and new_slot == 8): # left -> right

2
damnspam.py
View File

@@ -30,7 +30,7 @@ def location_str(block):
def add_input(creator, block, timeout_off, timeout_on): def add_input(creator, block, timeout_off, timeout_on):
global inputs global inputs
inputs[location_str(block)] = { inputs[location_str(block)] = {
"creator" : str(creator.getUniqueId()), "creator" : uid(creator),
"timeout_off" : timeout_off, "timeout_off" : timeout_off,
"timeout_on" : timeout_on, "timeout_on" : timeout_on,
"last_time" : 0 "last_time" : 0

18
forcefield.py
View File

@@ -53,14 +53,14 @@ def on_forcefield_command(sender, args):
def change_whitelist(sender, add, names): def change_whitelist(sender, add, names):
if names: if names:
sender_id = str(sender.getUniqueId()) sender_id = uid(sender)
if sender_id not in whitelists: if sender_id not in whitelists:
whitelists[sender_id] = [] whitelists[sender_id] = []
for name in names: for name in names:
player = server.getOfflinePlayer(name) player = server.getOfflinePlayer(name)
if player: if player:
player_id = str(player.getUniqueId()) player_id = uid(player)
pname = player.getName() pname = player.getName()
sname = sender.getDisplayName() sname = sender.getDisplayName()
@@ -86,7 +86,7 @@ def change_whitelist(sender, add, names):
def whitelist_list(sender): def whitelist_list(sender):
sender_id = str(sender.getUniqueId()) sender_id = uid(sender)
count = 0 count = 0
msg(sender, "%s &aForceField Whitelist:" % ff_prefix) msg(sender, "%s &aForceField Whitelist:" % ff_prefix)
for player_id in whitelists.get(sender_id, []): for player_id in whitelists.get(sender_id, []):
@@ -97,7 +97,7 @@ def whitelist_list(sender):
def whitelist_clear(sender): def whitelist_clear(sender):
sender_id = str(sender.getUniqueId()) sender_id = uid(sender)
if whitelists.get(sender_id): if whitelists.get(sender_id):
whitelists.pop(sender_id) whitelists.pop(sender_id)
msg(sender, "%s &aForceField Whitelist cleared." % ff_prefix) msg(sender, "%s &aForceField Whitelist cleared." % ff_prefix)
@@ -118,7 +118,7 @@ def forcefield_help(sender):
def forcefield_toggle(sender): def forcefield_toggle(sender):
sender_id = str(sender.getUniqueId()) sender_id = uid(sender)
if sender_id in ff_users: if sender_id in ff_users:
ff_users.remove(sender_id) ff_users.remove(sender_id)
msg(sender, "%s &aForceField toggle: &cOFF" % ff_prefix) msg(sender, "%s &aForceField toggle: &cOFF" % ff_prefix)
@@ -156,19 +156,19 @@ def move_away(player, entity):
def on_move(event): def on_move(event):
player = event.getPlayer() player = event.getPlayer()
if is_creative(player): if is_creative(player):
player_id = str(player.getUniqueId()) player_id = uid(player)
# moving player has forcefield, nerby player should be moved away # moving player has forcefield, nerby player should be moved away
if player_id in ff_users: if player_id in ff_users:
for entity in player.getNearbyEntities(fd, fd, fd): for entity in player.getNearbyEntities(fd, fd, fd):
whitelisted = (str(entity.getUniqueId()) in whitelists.get(player_id, [])) whitelisted = (uid(entity) in whitelists.get(player_id, []))
if is_player(entity) and not entity.hasPermission(pass_perm) and not whitelisted: if is_player(entity) and not entity.hasPermission(pass_perm) and not whitelisted:
move_away(player, entity) move_away(player, entity)
# nerby player has forcefield, moving player should be moved away # nerby player has forcefield, moving player should be moved away
if player.hasPermission(pass_perm): if player.hasPermission(pass_perm):
for entity in player.getNearbyEntities(fd, fd, fd): for entity in player.getNearbyEntities(fd, fd, fd):
entity_id = str(entity.getUniqueId()) entity_id = uid(entity)
ff_enabled = (entity_id in ff_users) ff_enabled = (entity_id in ff_users)
whitelisted = (player_id in whitelists.get(entity_id, [])) whitelisted = (player_id in whitelists.get(entity_id, []))
if is_player(entity) and is_creative(entity) and ff_enabled and not whitelisted: if is_player(entity) and is_creative(entity) and ff_enabled and not whitelisted:
@@ -181,6 +181,6 @@ def on_move(event):
@hook.event("player.PlayerQuitEvent") @hook.event("player.PlayerQuitEvent")
def on_quit(event): def on_quit(event):
player = event.getPlayer() player = event.getPlayer()
uid = str(player.getUniqueId()) uid = uid(player)
if uid in ff_users: if uid in ff_users:
ff_users.remove(uid) ff_users.remove(uid)

4
helpers.py
View File

@@ -99,3 +99,7 @@ def warp(player, args, warpname):
def is_creative(player): def is_creative(player):
return str(player.getGameMode()) == "CREATIVE" return str(player.getGameMode()) == "CREATIVE"
def uid(player):
return str(player.get-removeme-UniqueId())

8
mentio.py
View File

@@ -50,8 +50,8 @@ def on_chat(event):
def on_listen_command(sender, args): def on_listen_command(sender, args):
try: try:
currWords = [] currWords = []
if str(sender.getUniqueId()) in mentions.keys(): if uid(sender) in mentions.keys():
currWords = mentions[str(sender.getUniqueId())] currWords = mentions[uid(sender)]
# /listen add <word> # /listen add <word>
if len(args) == 2 and args[0].lower() == "add": if len(args) == 2 and args[0].lower() == "add":
@@ -65,7 +65,7 @@ def on_listen_command(sender, args):
if args[1].lower() is sender.getName(): if args[1].lower() is sender.getName():
msg(sender, "&cYou are always listening for your full ingame name by default") msg(sender, "&cYou are always listening for your full ingame name by default")
currWords.append(args[1].lower()) currWords.append(args[1].lower())
mentions[str(sender.getUniqueId())] = currWords mentions[uid(sender)] = currWords
msg(sender, "&aYou are now listening for '&2"+args[1].lower()+"'!") msg(sender, "&aYou are now listening for '&2"+args[1].lower()+"'!")
save_mentions() save_mentions()
return True return True
@@ -78,7 +78,7 @@ def on_listen_command(sender, args):
for word in currWords[:]: for word in currWords[:]:
if word.lower() == args[1].lower(): if word.lower() == args[1].lower():
currWords.remove(word.lower()) currWords.remove(word.lower())
mentions[str(sender.getUniqueId())] = currWords mentions[uid(sender)] = currWords
success = True success = True
if success == True: if success == True:
save_mentions() save_mentions()

2
misc.py
View File

@@ -85,7 +85,7 @@ def on_player_entity_interact(event):
last_shear = shear_time last_shear = shear_time
sender = event.getPlayer() sender = event.getPlayer()
entity = event.getRightClicked() entity = event.getRightClicked()
if is_player(entity) and str(entity.getUniqueId()) == "ae795aa8-6327-408e-92ab-25c8a59f3ba1" and str(sender.getItemInHand().getType()) == "SHEARS" and is_creative(sender): if is_player(entity) and uid(entity) == "ae795aa8-6327-408e-92ab-25c8a59f3ba1" and str(sender.getItemInHand().getType()) == "SHEARS" and is_creative(sender):
for i in range(5): for i in range(5):
entity.getWorld().dropItemNaturally(entity.getLocation(), ItemStack(bukkit.Material.getMaterial("REDSTONE"))) entity.getWorld().dropItemNaturally(entity.getLocation(), ItemStack(bukkit.Material.getMaterial("REDSTONE")))
entity.getWorld().dropItemNaturally(entity.getLocation(), ItemStack(bukkit.Material.getMaterial("WOOL"))) entity.getWorld().dropItemNaturally(entity.getLocation(), ItemStack(bukkit.Material.getMaterial("WOOL")))

2
reports.py
View File

@@ -103,7 +103,7 @@ def on_report_command(sender, args):
text = " ".join(args) text = " ".join(args)
loc = sender.getLocation() loc = sender.getLocation()
reporter = sender.name reporter = sender.name
reporter_id = str(sender.getUniqueId()) reporter_id = uid(sender)
report = { report = {
"uuid": reporter_id, "uuid": reporter_id,
"msg": text, "msg": text,

6
tilehelper.py
View File

@@ -35,7 +35,7 @@ def on_place_block(event):
block = event.getBlockPlaced() block = event.getBlockPlaced()
for th in tilehelpers: for th in tilehelpers:
area = th.get("area") area = th.get("area")
if th.get("owner") == str(player.getUniqueId()) and str(block.getWorld().getUID()) == th.get("world") and block.getX() in range(area[0][0], area[0][1]+1) and block.getY() in range(area[1][0], area[1][1]+1) and block.getZ() in range(area[2][0], area[2][1]+1) and event.canBuild(): if th.get("owner") == uid(player) and str(block.getWorld().getUID()) == th.get("world") and block.getX() in range(area[0][0], area[0][1]+1) and block.getY() in range(area[1][0], area[1][1]+1) and block.getZ() in range(area[2][0], area[2][1]+1) and event.canBuild():
# stack block in directions # stack block in directions
for direction in th.get("directions"): for direction in th.get("directions"):
@@ -76,7 +76,7 @@ def on_break_block(event):
block = event.getBlock() block = event.getBlock()
for th in tilehelpers: for th in tilehelpers:
area = th.get("area") area = th.get("area")
if th.get("owner") == str(player.getUniqueId()) and str(block.getWorld().getUID()) == th.get("world") and block.getX() in range(area[0][0], area[0][1]+1) and block.getY() in range(area[1][0], area[1][1]+1) and block.getZ() in range(area[2][0], area[2][1]+1): if th.get("owner") == uid(player) and str(block.getWorld().getUID()) == th.get("world") and block.getX() in range(area[0][0], area[0][1]+1) and block.getY() in range(area[1][0], area[1][1]+1) and block.getZ() in range(area[2][0], area[2][1]+1):
# stack block in directions # stack block in directions
for direction in th.get("directions"): for direction in th.get("directions"):
@@ -107,7 +107,7 @@ def on_block_interact(event):
block = event.getClickedBlock() block = event.getClickedBlock()
for th in tilehelpers: for th in tilehelpers:
area = th.get("area") area = th.get("area")
if th.get("owner") == str(player.getUniqueId()) and str(block.getWorld().getUID()) == th.get("world") and block.getX() in range(area[0][0], area[0][1]+1) and block.getY() in range(area[1][0], area[1][1]+1) and block.getZ() in range(area[2][0], area[2][1]+1): if th.get("owner") == uid(player) and str(block.getWorld().getUID()) == th.get("world") and block.getX() in range(area[0][0], area[0][1]+1) and block.getY() in range(area[1][0], area[1][1]+1) and block.getZ() in range(area[2][0], area[2][1]+1):
# stack block in directions # stack block in directions
for direction in th.get("directions"): for direction in th.get("directions"):