Teleport the player twice to fix #50

https://redstoner.com/forums/threads/3653-chatgroup-bug

blockplacemods.py

@@ -185,7 +185,7 @@ def toggle_command(sender, command, label, args):
             return " &cAlready disabled: " + details[1]
 
         if arglen == 2 and not arg2.isdigit():
-            return " &cArgument '%s' was not recognized. \nUse &o/toggle %s details &cfor more detailsrmation." % (arg2, setting)
+            return " &cArgument '%s' was not recognized. \nUse &o/toggle %s info &cfor more information." % (arg2, setting)
 
         if not enabled:
             values[uuid] = {}

chatalias.py

@@ -6,6 +6,7 @@ import org.bukkit as bukkit
 from org.bukkit import *
 from helpers import *
 
+
 # Version number and requirements
 
 alias_version = "2.1.0"
@@ -131,7 +132,7 @@ def on_alias_command(sender, cmd, label, args):
             return
         if args[0].lower() != "player" and not is_player(sender):
             msg(sender, "&cThe console cannot have aliases")
-            return
+            return True
         subcommands[args[0].lower()](sender, args[1:])
     except:
         subcommands["help"](sender, "1")
@@ -381,9 +382,8 @@ def save_data(uuid):
 def save_data_thread(uuid):
     conn = zxJDBC.connect(mysql_database, mysql_user, mysql_pass, "com.mysql.jdbc.Driver")
     curs = conn.cursor()
-    value = json_dumps(data[uuid])
+    curs.execute("INSERT INTO `chatalias` (`uuid`, `alias`) VALUES (?, ?) ON DUPLICATE KEY UPDATE `alias` = VALUES(`alias`);", 
-    curs.execute("INSERT INTO `chatalias` VALUES (?, ?) ON DUPLICATE KEY UPDATE `alias` = ?;", 
+        (uuid, json_dumps(data[uuid])))
-        (uuid, value, value))
     conn.commit()
     curs.close()
     conn.close()

chatgroups.py

@@ -102,8 +102,9 @@ def save_groups():
 @hook.event("player.AsyncPlayerChatEvent", "normal")
 def on_chat(event):
     sender = event.getPlayer()
+    user = get_py_player(sender)
     msge = event.getMessage()
-    if not event.isCancelled():
+    if (not user.logging_in) and (not event.isCancelled()):
         sender_id = uid(sender)
         key = get_key(sender_id)
         keylen = len(key)

check.py

@@ -35,11 +35,11 @@ def get_website_data(player):
     conn    = zxJDBC.connect(mysql_database, mysql_user, mysql_pass, "com.mysql.jdbc.Driver")
     curs    = conn.cursor()
     uuid = str(uid(player)).replace("-", "")
-    curs.execute("SELECT DISTINCT `id`, `email` FROM users WHERE `uuid` = ? LIMIT 1", (uuid,))
+    curs.execute("SELECT DISTINCT `id`, `email`, `confirmed` FROM users WHERE `uuid` = ? LIMIT 1", (uuid,))
     results = curs.fetchall()
     curs.close()
     conn.close()
-    return ("http://redstoner.com/users/%s" % results[0][0], results[0][1]) if results else (None, None)
+    return ("http://redstoner.com/users/%s" % results[0][0], results[0][1], False if results[0][2] == 0 else True) if results else (None, None, True)
 
 
 # receive country based on the user's IP
@@ -68,6 +68,8 @@ def get_all_data(sender, player):
         website = get_website_data(player)
         msg(sender, "&6>  Website account: &e%s" % website[0])
         msg(sender, "&6>    email: &e%s" % website[1])
+        if not website[2]:
+            msg(sender, "&6>    &cEmail NOT Confirmed!")
         msg(sender, "&7   -- Data provided by ipinfo.io")
         msg(sender, "&6>  Country: &e%s" % get_country(data))
         msg(sender, "&7   -- Data provided by Mojang")

cycle.py

@@ -56,7 +56,7 @@ def on_slot_change(event):
 
 def do_cycle(player, down):
     inv   = player.getInventory()
-    items = inv.getContents()
+    items = inv.getStorageContents()
     shift = -9 if down else 9
     shift = shift % len(items)
     for _ in range(4):
@@ -64,7 +64,7 @@ def do_cycle(player, down):
         uniq_items = sorted(set(list(items)[:9]))  # get unique inventory
         if uniq_items != [None]: # row not empty
             break
-    inv.setContents(items)
+    inv.setStorageContents(items)
 
 def save_cyclers():
     save_json_file("cycle", no_cyclers)

damnspam.py

@@ -173,8 +173,6 @@ def on_block_break(event):
 def on_interact(event):
     if (str(event.getAction()) == "RIGHT_CLICK_BLOCK") and not event.isCancelled():
         sender = event.getPlayer()
-        if sender.isSneaking():
-            return
         block   = event.getClickedBlock()
         pos_str = location_str(block)
         data    = inputs.get(pos_str)

loginsecurity.py

@@ -12,7 +12,7 @@ from player import get_py_player, py_players
 wait_time = 30 #seconds
 admin_perm = "utils.loginsecurity.admin"
 min_pass_length = 8
-blocked_events = ["block.BlockBreakEvent", "block.BlockPlaceEvent", "player.PlayerMoveEvent","player.AsyncPlayerChatEvent"]
+blocked_events = ["block.BlockBreakEvent", "block.BlockPlaceEvent", "player.AsyncPlayerChatEvent"]
 
 
 
@@ -273,4 +273,10 @@ def pre_command_proccess(event):
         args = event.getMessage().split(" ")
         if not args[0].lower() == "/login":
             msg(player.player, "&4You need to login before you do that!")
-            event.setCancelled(True)
+            event.setCancelled(True)
+    
+@hook.event("player.PlayerMoveEvent","normal")
+def player_move(event):
+    user = get_py_player(event.getPlayer())
+    if user.logging_in:
+        event.setTo(event.getFrom())

misc.py

@@ -216,7 +216,8 @@ pythoners = (
     "e452e012-2c82-456d-853b-3ac8e6b581f5", # Nemes
     "ae795aa8-6327-408e-92ab-25c8a59f3ba1", # jomo
     "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",

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)

punishments.py

@@ -55,6 +55,7 @@ class Slave(object):
     def update(self):
         self.blocks -= 1
         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())
             slaves.remove(self)
             save_slaves()

saylol.py

@@ -1,6 +1,7 @@
 from time import time
 from helpers import *
 from random import randrange
+import math
 
 lols     = open_json_file("lol", [])
 timeout  = 15
@@ -83,7 +84,7 @@ def on_lol_command(sender, command, label, args):
         if offset > len(lols):
             msg(sender, "&cNot a valid page (too high).")
             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))):
             msg(sender, "&a%s: &e%s" % (str(i).rjust(3), lols[i]))
         msg(sender, "")