Skip to content

Commit

Permalink
Fix collision group modified trigger
Browse files Browse the repository at this point in the history
  • Loading branch information
hoontee committed Mar 4, 2024
1 parent a413194 commit 113399f
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
Binary file modified Lync/Plugin.rbxm
Binary file not shown.
22 changes: 11 additions & 11 deletions Lync/RobloxPluginSource/Plugin.lua
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,7 @@ function getObjects(url: string): {Instance}?
end

function makeDirty(object: Instance, descendant: any, property: string?)
if not changedFiles[object] and object.Parent and (not property or property ~= "Archivable" and pcall(function() descendant[property] = descendant[property] end)) then
if not changedFiles[object] and object.Parent and (not property or property ~= "Archivable" and property ~= "CollisionGroupId" and pcall(function() descendant[property] = descendant[property] end)) then
if map.info.Debug then warn("[Lync] - Modified synced object:", object, property) end
changedFiles[object] = true
updateChangedFilesUI()
Expand Down Expand Up @@ -975,16 +975,6 @@ function buildPath(path: string)
end

function buildAll()
-- Build place file
local sortedPaths = {}
for path in pairs(map.tree) do
table.insert(sortedPaths, path)
end
table.sort(sortedPaths)
for _, path in sortedPaths do
buildPath(path)
end

-- Assign collision groups
if map.info.CollisionGroups then
if serverKey == "BuildScript" then
Expand All @@ -994,6 +984,16 @@ function buildAll()
setCollisionGroups()
end
end

-- Build place file
local sortedPaths = {}
for path in pairs(map.tree) do
table.insert(sortedPaths, path)
end
table.sort(sortedPaths)
for _, path in sortedPaths do
buildPath(path)
end
end

--offline-end
Expand Down

0 comments on commit 113399f

Please sign in to comment.