metrostroi-repo/MetrostroiAddon
1
0
Fork 0
mirror of https://github.com/metrostroi-repo/MetrostroiAddon.git synced 2026-05-02 00:42:29 +00:00
Code Activity

Merge pull request #586 from metrostroi-repo/#581

Browse Source 
Исправлена невозможность подключения удочки
This commit is contained in:
CrIcKeT98
2024-11-21 19:47:56 +03:00
committed by GitHub
parent d17cb74904 a7976c9fc9
commit e0d5ef965e
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lua/entities/gmod_track_udochka/init.lua
View File

@@ -22,13 +22,15 @@ local function removeWeldBetweenEnts(ent1,ent2)
end end
end end
function ENT:Use(ply) function ENT:Use(ply)
if self.Coupled then if IsValid(self.Coupled) then
sound.Play("buttons/lever8.wav",self:GetPos()) sound.Play("buttons/lever8.wav",self:GetPos())
removeWeldBetweenEnts(self,self.Coupled) removeWeldBetweenEnts(self,self.Coupled)
removeWeldBetweenEnts(self.Coupled,self) removeWeldBetweenEnts(self.Coupled,self)
self.Coupled.Connectors[self.ConnectorID] = nil
self.Timer = CurTime()+2 self.Timer = CurTime()+2
end end
self.ConnectorID = nil
self.Coupled = nil self.Coupled = nil
if ( self:IsPlayerHolding() ) then return end if ( self:IsPlayerHolding() ) then return end
if ply.PickupObject then ply:PickupObject( self ) end if ply.PickupObject then ply:PickupObject( self ) end

8
lua/entities/gmod_train_bogey/init.lua
View File

@@ -392,16 +392,10 @@ function ENT:CheckContact(pos,dir,id,cpos)
traceEnt:SetPos(self:LocalToWorld(cpos)) traceEnt:SetPos(self:LocalToWorld(cpos))
traceEnt:SetAngles(self:GetAngles()) traceEnt:SetAngles(self:GetAngles())
traceEnt.Coupled = self traceEnt.Coupled = self
traceEnt.ConnectorID = id
sound.Play("udochka_connect.wav",traceEnt:GetPos()) sound.Play("udochka_connect.wav",traceEnt:GetPos())
self.Connectors[id] = traceEnt self.Connectors[id] = traceEnt
DropEntityIfHeld(traceEnt) DropEntityIfHeld(traceEnt)
--[[timer.Simple(0,function()
if not IsValid(traceEnt) or not traceEnt:IsPlayerHolding() then return end
traceEnt:ForcePlayerDrop()
if traceEnt.LastPickup and traceEnt.LastPickup:IsPlayer() then
traceEnt.LastPickup:DropObject()
end
end)]]
end end
end end
return false return false