Compare commits
11 Commits
loginsecur
...
dev
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
347f6969bf | ||
|
|
6e497a2662 | ||
|
|
94accc238a | ||
|
|
2b803e8de8 | ||
|
|
f02fd2aae5 | ||
|
|
f6cb9ade9d | ||
|
|
a2daa5c0b6 | ||
|
|
5da7180bfd | ||
|
|
ae44dade80 | ||
|
|
5788cd0b3e | ||
|
|
00e936532a |
@@ -102,8 +102,9 @@ def save_groups():
|
|||||||
@hook.event("player.AsyncPlayerChatEvent", "normal")
|
@hook.event("player.AsyncPlayerChatEvent", "normal")
|
||||||
def on_chat(event):
|
def on_chat(event):
|
||||||
sender = event.getPlayer()
|
sender = event.getPlayer()
|
||||||
|
user = get_py_player(sender)
|
||||||
msge = event.getMessage()
|
msge = event.getMessage()
|
||||||
if not event.isCancelled():
|
if (not user.logging_in) and (not event.isCancelled()):
|
||||||
sender_id = uid(sender)
|
sender_id = uid(sender)
|
||||||
key = get_key(sender_id)
|
key = get_key(sender_id)
|
||||||
keylen = len(key)
|
keylen = len(key)
|
||||||
|
|||||||
3
misc.py
3
misc.py
@@ -216,7 +216,8 @@ pythoners = (
|
|||||||
"e452e012-2c82-456d-853b-3ac8e6b581f5", # Nemes
|
"e452e012-2c82-456d-853b-3ac8e6b581f5", # Nemes
|
||||||
"ae795aa8-6327-408e-92ab-25c8a59f3ba1", # jomo
|
"ae795aa8-6327-408e-92ab-25c8a59f3ba1", # jomo
|
||||||
"d2693e91-93e1-4e3f-929f-f38e1ce8df03", # Pepich1851
|
"d2693e91-93e1-4e3f-929f-f38e1ce8df03", # Pepich1851
|
||||||
"51f2ad3c-6cc8-40ea-aa2b-f25970316921" # Dico200
|
"51f2ad3c-6cc8-40ea-aa2b-f25970316921", # Dico200
|
||||||
|
"15ad0e60-8691-4e29-9de9-2d6b538bf56d" # psrcek
|
||||||
)
|
)
|
||||||
|
|
||||||
@simplecommand("pyeval",
|
@simplecommand("pyeval",
|
||||||
|
|||||||
30
plotter.py
30
plotter.py
@@ -1,30 +0,0 @@
|
|||||||
#!/usr/bin/python
|
|
||||||
|
|
||||||
"""
|
|
||||||
*Very basic* start of a custom plot-plugin like PlotMe
|
|
||||||
on hold because the PlotMe developer continued to develop PlotMe
|
|
||||||
"""
|
|
||||||
|
|
||||||
import sys
|
|
||||||
|
|
||||||
x_plot_size = 3
|
|
||||||
z_plot_size = 3
|
|
||||||
padding = 1
|
|
||||||
|
|
||||||
def base_coords(x, z):
|
|
||||||
pid = plot_id(x, z)
|
|
||||||
return [pid[0] * (x_plot_size + padding), pid[1] * (z_plot_size + padding)]
|
|
||||||
|
|
||||||
def bounds(x, z):
|
|
||||||
base = base_coords(x, z)
|
|
||||||
return [base, [base[0] + x_plot_size, base[1] + z_plot_size]]
|
|
||||||
|
|
||||||
def plot_id(x, z):
|
|
||||||
return [x // (x_plot_size + padding), z // (z_plot_size + padding)]
|
|
||||||
|
|
||||||
|
|
||||||
x = int(sys.argv[1])
|
|
||||||
z = int(sys.argv[2])
|
|
||||||
print "id: %s" % plot_id(x, z)
|
|
||||||
print "base: %s" % base_coords(x, z)
|
|
||||||
print "bounds: %s" % bounds(x, z)
|
|
||||||
@@ -55,6 +55,7 @@ class Slave(object):
|
|||||||
def update(self):
|
def update(self):
|
||||||
self.blocks -= 1
|
self.blocks -= 1
|
||||||
if self.blocks <= 0:
|
if self.blocks <= 0:
|
||||||
|
server.getPlayer(juuid(self.get_uuid())).teleport(server.getWorld(spawn_world).getSpawnLocation())
|
||||||
server.getPlayer(juuid(self.get_uuid())).teleport(server.getWorld(spawn_world).getSpawnLocation())
|
server.getPlayer(juuid(self.get_uuid())).teleport(server.getWorld(spawn_world).getSpawnLocation())
|
||||||
slaves.remove(self)
|
slaves.remove(self)
|
||||||
save_slaves()
|
save_slaves()
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
from time import time
|
from time import time
|
||||||
from helpers import *
|
from helpers import *
|
||||||
from random import randrange
|
from random import randrange
|
||||||
|
import math
|
||||||
|
|
||||||
lols = open_json_file("lol", [])
|
lols = open_json_file("lol", [])
|
||||||
timeout = 15
|
timeout = 15
|
||||||
@@ -83,7 +84,7 @@ def on_lol_command(sender, command, label, args):
|
|||||||
if offset > len(lols):
|
if offset > len(lols):
|
||||||
msg(sender, "&cNot a valid page (too high).")
|
msg(sender, "&cNot a valid page (too high).")
|
||||||
return True
|
return True
|
||||||
msg(sender, " &9&nLol list page %s" % str(arg1 + 1)) #"\t" symbol displays weirdly, hence the 4 spaces
|
msg(sender, " &9&nLol list page %s/%s" % (arg1 + 1, int(math.ceil(len(lols) / float(list_limit))))) #"\t" symbol displays weirdly, hence the 4 spaces
|
||||||
for i in range(offset, min(offset + list_limit, len(lols))):
|
for i in range(offset, min(offset + list_limit, len(lols))):
|
||||||
msg(sender, "&a%s: &e%s" % (str(i).rjust(3), lols[i]))
|
msg(sender, "&a%s: &e%s" % (str(i).rjust(3), lols[i]))
|
||||||
msg(sender, "")
|
msg(sender, "")
|
||||||
|
|||||||
Reference in New Issue
Block a user