Merge pull request #2 from suppergerrie2/double-disable-fix

Fix survival inventory being copied into buildmode

Author: kruthers

src/main/kotlin/com/kruthers/gamemode4core/commands/UnwatchCommand.kt

@@ -20,7 +20,7 @@ class UnwatchCommand(val plugin: Gamemode4Core): CommandExecutor {
 
                 if (playerData.getBoolean("mode.watching")) {
 
-                    Watching.disable(plugin, player, playerData)
+                    Watching.disable(plugin, player, playerData, true)
 
                 } else {
                     player.sendMessage("${ChatColor.RED}You must be watching someone to be able to unwatch")

src/main/kotlin/com/kruthers/gamemode4core/commands/WatchConfirmCommand.kt

@@ -29,7 +29,7 @@ class WatchConfirmCommand(val plugin: Gamemode4Core): CommandExecutor {
 
                     if (target == null) {
                         player.sendMessage("${ChatColor.RED}Unable to locate target, exiting watch mode")
-                        Watching.disable(plugin, player, playerData)
+                        Watching.disable(plugin, player, playerData, true)
                     } else {
                         if (target.isOnline) {
                             target.player?.let { player.teleport(it.location) }

src/main/kotlin/com/kruthers/gamemode4core/events/PlayerConnectionEvents.kt

@@ -152,7 +152,7 @@ class PlayerConnectionEvents(val plugin: Gamemode4Core): Listener {
                     val target: OfflinePlayer? = playerData.getString("storage.watching.target")?.let { Bukkit.getOfflinePlayer(UUID.fromString(it)) }
 
                     if (target == null) {
-                        Watching.disable(plugin, player, playerData)
+                        Watching.disable(plugin, player, playerData, true)
                     } else {
                         player.sendMessage(getMessage(plugin, "watch.join").replace("{target}",target.name?:"null"))
                         Gamemode4Core.watchingPlayers[player] = target.uniqueId

src/main/kotlin/com/kruthers/gamemode4core/modes/ModMode.kt

@@ -78,7 +78,7 @@ class ModMode {
             var playerData: YamlConfiguration = pd
             //disabling watching
             if (playerData.getBoolean("mode.watching")){
-                playerData = Watching.disable(plugin, player, playerData)
+                playerData = Watching.disable(plugin, player, playerData, false)
             }
 
             // save mode inventory

src/main/kotlin/com/kruthers/gamemode4core/modes/Watching.kt

@@ -49,7 +49,7 @@ class Watching {
 
         }
 
-        fun disable(plugin: Gamemode4Core, player: Player, pd: YamlConfiguration): YamlConfiguration {
+        fun disable(plugin: Gamemode4Core, player: Player, pd: YamlConfiguration, disableModMode: Boolean): YamlConfiguration {
             var playerData: YamlConfiguration = pd;
             //set watching to false
             playerData.set("mode.watching",false);
@@ -70,7 +70,7 @@ class Watching {
             Gamemode4Core.watchingPlayers.remove(player)
 
             //check if they only entered mod mode to use watch mode
-            if (playerData.getBoolean("storage.watching.watchEntrance")) {
+            if (disableModMode && playerData.getBoolean("storage.watching.watchEntrance")) {
                 playerData = ModMode.disable(plugin,player,playerData)
             }