0.4.2

CHANGES.md

@@ -3,6 +3,10 @@
 ## Current Master
 *No changes*
 
+## 0.4.2 (April 4, 2018)
+* Fixed final case of duplicated instance insertion, caused by reconciled instances not being inserted into `RouteMap`.
+	* The reconciler is still not a perfect solution, especially if script instances get moved around without being destroyed. I don't think this can be fixed before a big refactor.
+
 ## 0.4.1 (April 1, 2018)
 * Merged plugin repository into main Rojo repository for easier tracking.
 * Improved `RouteMap` object tracking; this should fix some cases of duplicated instances being synced into the tree.

README.md

@@ -5,10 +5,10 @@
 <div>&nbsp;</div>
 
 <div align="center">
-	<a href="https://travis-ci.org/LPGhatguy/rojo">
+  <a href="https://travis-ci.org/LPGhatguy/rojo">
-		<img src="https://api.travis-ci.org/LPGhatguy/rojo.svg?branch=master" alt="Travis-CI Build Status" />
+    <img src="https://api.travis-ci.org/LPGhatguy/rojo.svg?branch=master" alt="Travis-CI Build Status" />
-	</a>
+  </a>
-  <img src="https://img.shields.io/badge/latest_version-0.4.1-brightgreen.svg" alt="Current server version" />
+  <img src="https://img.shields.io/badge/latest_version-0.4.2-brightgreen.svg" alt="Current server version" />
 </div>
 
 <hr />

plugin/src/Config.lua

@@ -1,6 +1,6 @@
 return {
 	pollingRate = 0.2,
-	version = {0, 4, 1},
+	version = {0, 4, 2},
 	expectedServerVersionString = "0.4.x",
 	protocolVersion = 1,
 	dev = false,

plugin/src/Main.server.lua

@@ -67,12 +67,10 @@ local function main()
 		.Click:Connect(function()
 			checkUpgrade()
 
-			spawn(function()
+			pluginInstance:togglePolling()
-				pluginInstance:togglePolling()
+				:catch(function(err)
-					:catch(function(err)
+					warn(err)
-						warn(err)
+				end)
-					end)
-			end)
 		end)
 end
 

plugin/src/Reconciler.lua

@@ -161,6 +161,10 @@ function Reconciler:reconcile(rbx, item)
 	-- Use a dumb algorithm for reconciling children
 	self:_reconcileChildren(rbx, item)
 
+	if item.Route then
+		self._routeMap:insert(item.Route, rbx)
+	end
+
 	return rbx
 end
 

server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rojo"
-version = "0.4.1"
+version = "0.4.2"
 authors = ["Lucien Greathouse <me@lpghatguy.com>"]
 description = "A tool to create robust Roblox projects"
 license = "MIT"