Merge pull request #278 from GMLambda/fix-doors

Fix transitioning doors
GMLambda · May 19, 2024 · b1c5af1 · b1c5af1
2 parents 6b35680 + b96c670
commit b1c5af1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,4 +1,5 @@
 0.9.23 (in development)
+- Fixed: Transitioning doors have sometimes the wrong rotation.
 
 0.9.22
 - Improved: Weapon selection weights, this should improve selecting the next weapon when current one is empty.

diff --git a/gamemode/sv_transition.lua b/gamemode/sv_transition.lua
@@ -744,8 +744,6 @@ function GM:CreateTransitionObjects()
 
     DbgPrint("Creating " .. tostring(objCount) .. " transition Objects...")
     local entityTransitionData = {}
-    ignoreKeyIndex = -1 -- ignoreKeyIndex + 1
-    DbgPrint("IgnoreKeyIndex: " .. ignoreKeyIndex)
     for _, data in pairs(objects) do
         if data.Ignored == true then continue end
         -- NOTE/FIXME: Observed different results on linux
@@ -773,7 +771,6 @@ function GM:CreateTransitionObjects()
         ent.SourceMap = data.SourceMap
         ent.ShouldDispatchSpawn = dispatchSpawn
         -- Do key values first because we might override a few things with setters.
-        local keyIndex = 0
         for k, v in pairs(data.KeyValues) do
             if KEYVALUE_BLACKLIST[k] == true then continue end
             v = tostring(v)
@@ -786,15 +783,9 @@ function GM:CreateTransitionObjects()
                 ent:SetKeyValue(k, v)
                 GAMEMODE:EntityKeyValue(ent, k, v)
             else
-                if keyIndex == ignoreKeyIndex then
-                    DbgPrint("IGNORED KEY: " .. k)
-                else
-                    ent:SetKeyValue(k, v)
-                    GAMEMODE:EntityKeyValue(ent, k, v)
-                end
+                ent:SetKeyValue(k, v)
+                GAMEMODE:EntityKeyValue(ent, k, v)
             end
-
-            keyIndex = keyIndex + 1
         end
 
         for k, v in pairs(data.EntityOutputs or {}) do
@@ -810,11 +801,12 @@ function GM:CreateTransitionObjects()
         end
 
         ent:SetPos(data.Pos)
-        ent:SetAngles(data.Ang)
+        if data.Type ~= ENT_TYPE_DOOR then
+            ent:SetAngles(data.Ang)
+        end
         ent:SetVelocity(data.Vel)
         if data.Mdl ~= nil then
             ent:SetModel(data.Mdl)
-            DbgPrint(data.Mdl)
         end
 
         ent:SetName(data.Name)
@@ -922,5 +914,4 @@ function GM:CreateTransitionObjects()
         end
     end
 
-    if ignoreKeyIndex ~= -1 then ignoreKeyIndex = ignoreKeyIndex + 1 end
 end