4.1.1_Pre1上限时传送可以设置次数，解决back问题。

yueyinqiu · Jun 26, 2020 · 0de1411 · 0de1411
1 parent 6eb2b3d
commit 0de1411
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 12 deletions.
diff --git a/NWorldPermissions/res/config.yml b/NWorldPermissions/res/config.yml
@@ -1,7 +1,9 @@
 # config.yml
 
-controlled-worlds: []
+controlled-worlds:
 
 offline-players-tracker:
   enabled: true
-  record-only: true
+  teleport-times:
+    position-changed: 0
+    position-unchanged: 0
diff --git a/NWorldPermissions/res/messages.yml b/NWorldPermissions/res/messages.yml
@@ -47,7 +47,7 @@ messages:
     offline:
       tracker-not-enabled: |
         &r&3> Oh, {senderName}&r&3! You haven't enabled the offline players tracker.
-        Make sure you've set 'offline-players-tracker.enabled' to 'true', and 'offline-players-tracker.record-only' to 'false' in file 'config.yml'.
+        Make sure you've set 'offline-players-tracker.enabled' to 'true'.
       # Available Arg(s): {senderName}.
       no-such-world: |
         &r&3> {senderName}&r&3? Which world is '{worldName}'?

diff --git a/NWorldPermissions/res/plugin.yml b/NWorldPermissions/res/plugin.yml
@@ -1,6 +1,6 @@
 name: NWorldPermissions
 main: top.nololiyt.worldpermissions.RootPlugin
-version: 4.1.0
+version: 4.1.1_Pre1
 author: yueyinqiu5990
 description: A strange power stopping players being teleported to a world.
 website: https://github.com/yueyinqiu/NWorldPermissions/wiki

diff --git a/NWorldPermissions/src/top/nololiyt/worldpermissions/commands/tp/OfflineExecutor.kt b/NWorldPermissions/src/top/nololiyt/worldpermissions/commands/tp/OfflineExecutor.kt
@@ -37,8 +37,7 @@ class OfflineExecutor : Executor()
         val basePairs = arrayOf<StringPair?>(StringPair.markName(markName), StringPair.worldName(worldName),
             StringPair.senderName(commandSender.name));
 
-        if (!rootPlugin.config.getBoolean("offline-players-tracker.enabled") || rootPlugin.config.getBoolean(
-                "offline-players-tracker.record-only"))
+        if (!rootPlugin.config.getBoolean("offline-players-tracker.enabled"))
         {
             rootPlugin.messagesManager.sendMessage(messageKey.append("tracker-not-enabled"), basePairs, commandSender);
             return true;
@@ -68,7 +67,8 @@ class OfflineExecutor : Executor()
             val position = configuration.getLocation("position") ?: continue;
             if (position.world == world)
             {
-                configuration.set("position", location)
+                configuration.set("position", location);
+                configuration.set("changed", true);
                 try
                 {
                     configuration.save(file);

diff --git a/NWorldPermissions/src/top/nololiyt/worldpermissions/playerlisteners/#AndQuitListener.kt b/NWorldPermissions/src/top/nololiyt/worldpermissions/playerlisteners/#AndQuitListener.kt
@@ -21,17 +21,28 @@ class LoginAndQuitListener(private val rootPlugin: RootPlugin) : Listener
     @EventHandler
     fun onPlayerLogin(e: PlayerJoinEvent)
     {
-        if (!rootPlugin.config.getBoolean("offline-players-tracker.enabled") || rootPlugin.config.getBoolean(
-                "offline-players-tracker.record-only")) return;
+        if (!rootPlugin.config.getBoolean("offline-players-tracker.enabled")) return;
         val player = e.player;
         var file = File(rootPlugin.dataFolder.absolutePath, "playersData");
         file.mkdirs();
         file = File(file.absolutePath, player.uniqueId.toString() + ".yml");
         if (!file.exists()) return;
-        
+
         val yamlConfiguration = YamlConfiguration.loadConfiguration(file);
-        val location = yamlConfiguration.get("position");
-        if (location != null) player.teleport((location as Location?)!!);
+        val position = yamlConfiguration.get("position");
+        if (position != null)
+        {
+            val location = position as Location;
+            val times = when (yamlConfiguration.getBoolean("changed", false))
+            {
+                true  -> rootPlugin.config.getInt("offline-players-tracker.teleport-times.position-changed")
+                false -> rootPlugin.config.getInt("offline-players-tracker.teleport-times.position-unchanged")
+            }
+            for (index in 0 until times)
+            {
+                player.teleport(location);
+            }
+        }
     }
 
     @EventHandler
@@ -48,6 +59,7 @@ class LoginAndQuitListener(private val rootPlugin: RootPlugin) : Listener
 
             val yamlConfiguration = YamlConfiguration.loadConfiguration(file);
             yamlConfiguration.set("position", player.location);
+            yamlConfiguration.set("changed", false);
             yamlConfiguration.save(file);
         }
         catch (ex: IOException)