v2.2.1

Author: Ra1ny-Yuki

lang/en_us.yml

@@ -21,6 +21,7 @@ where_is:
     not_online: "Required player {} is not online"
     perm_denied: "Permission denied"
     invalid_args: "Invalid argument"
+    not_player: This operation can only be performed by player
   warn:
     duplicated_here: "Duplicated function between this plugin and Here, this function will not be triggered while Here exists"
   hover:

lang/zh_cn.yml

@@ -21,6 +21,7 @@ where_is:
     not_online: "玩家 §4{}§c 不在线"
     perm_denied: "权限不足"
     invalid_args: "无效的参数"
+    not_player: 该操作仅可由玩家执行
   warn:
     duplicated_here: "本插件与Here存在功能重复，本插件的Here功能暂停工作"
   hover:
@@ -32,5 +33,5 @@ where_is:
     the_nether: '下界'
     the_end: '末地'
   cfg:
-    vanilla_dim_missed: '适用于语言"{0}"的原版维度名称未找到: {1}'
+    vanilla_dim_missed: '适用于语言 "{0}" 的原版维度名称未找到: {1}'
     dim_key_missed: '原版维度翻译键未找到: {0}'

mcdreforged.plugin.json

@@ -1,6 +1,6 @@
 {
     "id": "where_is",
-    "version": "2.2.0+build.12",
+    "version": "2.2.1",
     "name": "Where Is",
     "description":  {
         "en_us": "Query players' coordinates",

where_is/config.py

@@ -16,7 +16,7 @@ def query_is_allowed(self, source: CommandSource):
         return source.has_permission(self.where_is)
 
     def broadcast_is_allowed(self, source: CommandSource):
-        return source.has_permission(self.here) and isinstance(source, PlayerCommandSource)
+        return source.has_permission(self.here)
 
     def is_admin(self, source: CommandSource):
         return source.has_permission(self.admin)
@@ -111,7 +111,7 @@ class Config(Serializable):
         NETHER_SHORT: 'advancements.nether.root.title',
         END_SHORT: 'advancements.end.root.title'
     }
-    # Enable this option will result in invalid MCDR language preference while calling "!!here"
+    # Enable this option will result in invalid MCDR language pref while calling "!!here"
     # But enable this may relieve the emotion of code OCD patients xD
     here_use_broadcast: bool
 

where_is/entry.py

@@ -274,6 +274,9 @@ def register_commands(server: PluginServerInterface):
         here_root = Literal(config.command_prefix.here_prefixes).requires(
             config.permission_requirements.broadcast_is_allowed,
             lambda: rtr('err.perm_denied')
+        ).requires(
+            lambda src: src.is_player,
+            lambda: rtr('err.not_player')
         ).runs(here)
         here_root.then(
             Literal('highlight').then(
@@ -285,13 +288,15 @@ def register_commands(server: PluginServerInterface):
 
 def register_help_messages(server: PluginServerInterface):
     if config.enable_where_is:
-        for p in config.command_prefix.where_is_prefixes:
-            server.register_help_message(p, server.get_self_metadata().description,
-                                         permission=config.permission_requirements.where_is)
+        for pre in config.command_prefix.where_is_prefixes:
+            server.register_help_message(
+                pre, rtr('help.vris'), permission=config.permission_requirements.where_is
+            )
     if config.enable_here:
-        for p in config.command_prefix.here_prefixes:
-            server.register_help_message(p, server.get_self_metadata().description,
-                                         permission=config.permission_requirements.here)
+        for pre in config.command_prefix.here_prefixes:
+            server.register_help_message(
+                pre, rtr('help.here'), permission=config.permission_requirements.here
+            )
 
 
 def register_customized_translations(server: PluginServerInterface):
@@ -305,7 +310,3 @@ def on_load(server: PluginServerInterface, prev_modules):
     register_help_messages(server)
     register_customized_translations(server)
     register_commands(server)
-    for pre in config.command_prefix.here_prefixes:
-        server.register_help_message(pre, rtr('help.here'))
-    for pre in config.command_prefix.where_is_prefixes:
-        server.register_help_message(pre, rtr('help.vris'))

where_is/online_players.py

@@ -13,6 +13,7 @@ def __init__(self):
         self.__lock = RLock()
         self.__players: List[str] = []
         self.__limit = 0
+        self.__enabled = False
 
     def get_player_list(self, refresh: bool = False):
         with self.__lock:
@@ -26,14 +27,16 @@ def get_player_limit(self, refresh: bool = False):
                 self.__refresh_online_players()
             return self.__limit
 
+    @named_thread
     def __add_player(self, player: str):
         with self.__lock:
-            if psi.is_server_startup() and player not in self.__players:
+            if self.__enabled and player not in self.__players:
                 self.__players.append(player)
 
+    @named_thread
     def __remove_player(self, player: str):
         with self.__lock:
-            if player in self.__players:
+            if self.__enabled and player in self.__players:
                 self.__players.remove(player)
 
     @named_thread
@@ -57,10 +60,16 @@ def __refresh_online_players(self):
                         "Incorrect player count found while refreshing player list"
                     )
 
+    @named_thread
+    def __enable_player_join(self):
+        with self.__lock:
+            self.__enabled = True
+            debug("Player list counting enabled")
+
     @named_thread
     def __clear_online_players(self):
         with self.__lock:
-            self.__limit, self.__players = None, None
+            self.__limit, self.__players = None, []
             debug("Cleared online player cache")
 
     def register_event_listeners(self):
@@ -69,8 +78,8 @@ def register_event_listeners(self):
             lambda *args, **kwargs: self.__refresh_online_players(),
         )
         psi.register_event_listener(
-            MCDRPluginEvents.SERVER_STARTUP,
-            lambda *args, **kwargs: self.__refresh_online_players(),
+            MCDRPluginEvents.SERVER_START,
+            lambda *args, **kwargs: self.__enable_player_join(),
         )
         psi.register_event_listener(
             MCDRPluginEvents.PLAYER_JOINED,