Master update 1.0.19 build 28

CHANGELOG.md

@@ -1,4 +1,22 @@
 #Changelog#
+
+<h4>1.0.19 rc 28</h4>
+Bugfixes:
+- Bugfix commands.py line 784 where player message is used with no argument.
+- fix player to player teleport ValueError bug caused by trying to read coordinates
+ where only a player name was given ("[lukeeexd: Teleported lukeeexd to Nyaii]")
+- Fix Chat.py plugin (all player's were sharing the same chat configuration).
+- Fix Chat.py breaking on /reload.
+- bugfix message from offline wrapper that is a hub in mcserver.py.
+- changed deop to allow any vanilla level 4 OP to run it.
+- Explicitly `close()` sockets that were shutdown.
+- substitute 'localhost' for code occurences of '127.0.0.1'.
+New Plugin:
+- add Geode plugin that prints each player's IP and country code at login.
+
+<h4>1.0.17-18 rc 22-23</h4>
+-bugfix for non-proxy setups.  See Dev changelogs (on development branch).
+
 <h4>1.0.15 rc 20</h4>
 Primary reasons for update:
 - Regular update prior to further new Wrapper development

build/CHANGELOG.DEV.md

@@ -1,4 +1,43 @@
+Build 28, 1.0.19 RC 28
+- Bugfix commands.py line 784 where player message is used with no argument.
+- Update Master branch
+
+Build 27
+- increment version to 1.0.18 RC 27
+- fix player to player teleport ValueError bug caused by trying to read coordinates
+ where only a player name was given ("[lukeeexd: Teleported lukeeexd to Nyaii]")
+- create PR to development.
+
+Build 26
+- Fix Chat.py plugin (all player's were sharing the same chat configuration).
+- Fix Chat.py breaking on /reload.
+- bugfix message from offline wrapper that is a hub in mcserver.py.
+- changed deop to allow any vanilla level 4 OP to run it.
+- add Geode plugin that prints each player's IP and country code at login.
+
+Build 25
+- Explicitly `close()` sockets that were shutdown.
+- substitute 'localhost' for code occurences of '127.0.0.1'.
+
+Build 24
+Version number bumps to match Master  1.0.17 RC 24
+
+Build 23
+- Bugfixes:
+  - at player logout (mcserver.py), server would attempt to run
+   proxy method removestaleclients(), even if proxy mode was not running.
+  - mcserver.py getplayer() not returning a player object in non-proxy mode.
+
+Build 22
+- Implement the proxy host as a ProcessPoolExecutor multiprocessor (only on Python3)
+
+Build 21 (In-process Dev build) [1.0.16 RC 21]
+- Refractor proxy and remove external "ServerVitals" class and integrate wrapper into proxy again.
+
+Build 21 [1.0.16 RC 21]  (Patch to Master)
+- Bugfix - at player logout (mcserver.py), server would attempt to run
+ proxy method removestaleclients(), even if proxy mode was not running.
 
 Starting with:
-Build 21 [1.0.15 RC 20] - Development branch update
+Build 20 [1.0.15 RC 20] - Development branch update
 - includes first version of vanilla claims plugin.

build/Wrapper.py.md5

@@ -1 +1 @@
-d5eda047085fd61c6a705dbeb4ca6ec7
+d5aca2e96299c3d95a332fdf0b119b75

build/buildinfo.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 # Do not edit this file to bump versions; it is built automatically
 
-__version__ = [1, 0, 15, 'rc', 20]
+__version__ = [1, 0, 19, 'rc', 28]
 __branch__ = 'stable'

build/version.json

@@ -4,11 +4,11 @@
     "__version__": [
         1, 
         0, 
-        15, 
+        19, 
         "rc", 
-        20
+        28
     ], 
     "build": 229, 
-    "release_time": 1526743791.661702, 
+    "release_time": 1534692383.768469, 
     "repotype": "stable"
 }

docs/Wrapper.py.md5

@@ -1 +1 @@
-d5eda047085fd61c6a705dbeb4ca6ec7
+d5aca2e96299c3d95a332fdf0b119b75

documentation/player.rst

@@ -85,7 +85,7 @@
     ..
 
 
--  connect(self, ip="127.0.0.1", port=25600)
+-  connect(self, ip="localhost", port=25600)
 
         Connect to another server.  Upon calling, the client's current
          server instance will be closed and a new server connection made

stable-plugins/Geode.py

@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+
+# pip install --user pygeoip
+try:
+    import pygeoip
+except ImportError:
+    pygeoip = False
+    DEPENDENCIES = ["ImportError: could not import package pygeoip", ]
+
+NAME = "Geode"
+AUTHOR = "SurestTexas00"
+ID = "com.suresttexas00.plugins.geode"
+VERSION = (0, 1, 0)
+SUMMARY = "Lookup player's country based on ip."
+WEBSITE = ""
+DESCRIPTION = """
+Test plugin to lookup player's country using pygeoip.
+"""
+
+
+# noinspection PyPep8Naming,PyMethodMayBeStatic,PyUnusedLocal
+# noinspection PyClassicStyleClass,PyAttributeOutsideInit
+class Main:
+    def __init__(self, api, log):
+        self.api = api
+        self.minecraft = api.minecraft
+        self.log = log
+
+    def onEnable(self):
+        self.api.registerEvent("player.login", self.login)
+        self.data_storageobject = self.api.getStorage(
+            "geode", world=False, pickle=False
+        )
+        self.data = self.data_storageobject.Data
+        self.gi = pygeoip.GeoIP('/usr/share/GeoIP/GeoIP.dat',
+                                flags=pygeoip.const.MMAP_CACHE)
+
+    def onDisable(self):
+        self.data_storageobject.close()
+
+    def login(self, payload):
+        playerObj = payload["player"]
+        print(playerObj.ipaddress)
+        x = self.gi.country_code_by_addr(playerObj.ipaddress)
+        self.log.info(
+            "%s logged on from an ip (%s) in country '%s'." % (
+                playerObj.username, playerObj.ipaddress, x)
+        )

stable-plugins/chat.py

@@ -1,5 +1,6 @@
 # coding=utf-8
 
+import copy
 import sys
 
 PY3 = sys.version_info[0] > 2
@@ -21,25 +22,25 @@
 SECT = u'\xa7'
 
 
-# noinspection PyPep8Naming,PyCompatibility
+# noinspection PyPep8Naming,PyMethodMayBeStatic,PyUnusedLocal
+# noinspection PyClassicStyleClass,PyAttributeOutsideInit
 class Main:
     def __init__(self, api, log):
+
         self.api = api
         self.log = log
-        self.ranks = {}
-        self.player_ranks = {}
-        self.default = {
-                "trans": False,
-                "isOp": False,
-                "rank": None,
-                "color": "f"  # white
-            }
 
     def onEnable(self):
         self.api.registerEvent("player.chatbox", self.playerChatBox)
-        self.api.registerEvent("player.login", self.login)
         self.api.registerEvent("player.logout", self.logout)
 
+        self.player_ranks = {}
+        self.default = {
+            "trans": False,
+            "isOp": False,
+            "rank": None,
+            "color": "f"  # white
+        }
         self.ranks = [  # from highest to lowest
             # perm               display rank       display color
             {"perm": "owner", "rank": "Owner", "color": "4"},
@@ -55,12 +56,11 @@ def onEnable(self):
     def onDisable(self):
         pass
 
-    def login(self, payload):
-        """ Obtain the player's rank when he logs in """
-        player = payload["player"]
-        uuid = player.uuid
-        if uuid not in self.player_ranks:
-            self.player_ranks[uuid] = self.default
+    def verify(self, player):
+        """ Obtain the player's rank """
+        if player.uuid not in self.player_ranks:
+            uuid = player.uuid
+            self.player_ranks[uuid] = copy.copy(self.default)
             if player.isOp():
                 self.player_ranks[uuid]["isOp"] = True
 
@@ -85,8 +85,8 @@ def playerChatBox(self, payload):
         """ We can modify the chat.
 
         All the permissions legwork that could slow up the code
-        is already done just once at login.. we have to keep this
-        packet moving to prevent lag!
+        is done just once when player chat is first used..
+        we have to keep this packet moving to prevent lag!
 
         {'translate': 'chat.type.text',
          'with': [__[0]__{'clickEvent': {'action': 'suggest_command',
@@ -103,6 +103,7 @@ def playerChatBox(self, payload):
 
         player = payload["player"]
         data = payload["json"]
+        self.verify(player)
 
         if "translate" in data:  # special type of chat
 
@@ -124,7 +125,7 @@ def playerChatBox(self, payload):
 
                 # chatdisplayname[0]
                 insertionplayer = self.api.minecraft.getPlayer(insertionplayername)  # noqa
-
+                self.verify(insertionplayer)
                 # permanently tag OP suffix
                 if self.player_ranks[insertionplayer.uuid]["isOp"]:
                     data["with"][0]["text"] = "%s §8[OP]§r" % chatdisplayname