wiremod/advdupe2
1
0
Fork 0
mirror of https://github.com/wiremod/advdupe2.git synced 2025-03-04 03:03:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Track revision in Queue to avoid bad backwards compat (#442)

Browse Source 
* Track revision in Queue to avoid bad backwards compat

* Remove revision parameter
This commit is contained in:
Denneisk 2023-10-30 14:25:00 -04:00 committed by GitHub
parent 9d2d43c908
commit 7f061801bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lua/advdupe2/sv_clipboard.lua
View File

@ -1226,7 +1226,6 @@ local function AdvDupe2_Spawn()
AdvDupe2.InitProgressBar(Queue.Player, "Pasting:")
Queue.Player.AdvDupe2.Queued = false
end
local newpos
if (Queue.Current > #Queue.SortedEntities) then
Queue.Entity = false
Queue.Constraint = true
@ -1242,14 +1241,14 @@ local function AdvDupe2_Spawn()
local v = Queue.EntityList[k]
if (not v.BuildDupeInfo) then v.BuildDupeInfo = {} end
if (v.LocalPos) then
for i, p in pairs(v.PhysicsObjects) do
if Queue.Revision < 1 and v.LocalPos then
for i, _ in pairs(v.PhysicsObjects) do
v.PhysicsObjects[i] = {Pos = v.LocalPos, Angle = v.LocalAngle}
end
end
v.BuildDupeInfo.PhysicsObjects = table.Copy(v.PhysicsObjects)
proppos = v.PhysicsObjects[0].Pos
local proppos = v.PhysicsObjects[0].Pos
v.BuildDupeInfo.PhysicsObjects[0].Pos = Vector(0, 0, 0)
if (Queue.OrigPos) then
for i, p in pairs(v.BuildDupeInfo.PhysicsObjects) do
@ -1553,12 +1552,25 @@ end
function AdvDupe2.InitPastingQueue(Player, PositionOffset, AngleOffset, OrigPos, Constrs, Parenting, DisableParents, DisableProtection)
local i = #AdvDupe2.JobManager.Queue + 1
AdvDupe2.JobManager.Queue[i] = {}
local Queue = AdvDupe2.JobManager.Queue[i]
Queue.Player = Player
Queue.SortedEntities = {}
Queue.EntityList = table.Copy(Player.AdvDupe2.Entities)
local Queue = {
Player = Player,
SortedEntities = {},
EntityList = table.Copy(Player.AdvDupe2.Entities),
Current = 1,
Name = Player.AdvDupe2.Name,
Entity = true,
Constraint = false,
Parenting = Parenting,
DisableParents = DisableParents,
DisableProtection = DisableProtection,
CreatedEntities = {},
CreatedConstraints = {},
PositionOffset = PositionOffset or Vector(0, 0, 0),
AngleOffset = AngleOffset or Angle(0, 0, 0),
Revision = Player.AdvDupe2.Revision,
}
AdvDupe2.JobManager.Queue[i] = Queue
if (Constrs) then
Queue.ConstraintList = table.Copy(Player.AdvDupe2.Constraints)
@ -1579,17 +1591,6 @@ function AdvDupe2.InitPastingQueue(Player, PositionOffset, AngleOffset, OrigPos,
" Entities and " .. #Player.AdvDupe2.Constraints .. " Constraints.")
end
Queue.Current = 1
Queue.Name = Player.AdvDupe2.Name
Queue.Entity = true
Queue.Constraint = false
Queue.Parenting = Parenting
Queue.DisableParents = DisableParents
Queue.DisableProtection = DisableProtection
Queue.CreatedEntities = {}
Queue.CreatedConstraints = {}
Queue.PositionOffset = PositionOffset or Vector(0, 0, 0)
Queue.AngleOffset = AngleOffset or Angle(0, 0, 0)
Queue.Plus = #Queue.SortedEntities
Queue.Percent = 1 / (#Queue.SortedEntities + #Queue.ConstraintList)
AdvDupe2.InitProgressBar(Player, "Queued:")

1
lua/advdupe2/sv_file.lua
View File

@ -66,6 +66,7 @@ function AdvDupe2.LoadDupe(ply,success,dupe,info,moreinfo)
ply.AdvDupe2.Entities = {}
ply.AdvDupe2.Constraints = {}
ply.AdvDupe2.HeadEnt={}
ply.AdvDupe2.Revision = info.revision
if(info.ad1)then