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

Фикс self:GetOwner()

Browse Source 
Добавлено наследование от базового класса "base_gmodentity" для корректной работы E2 (enitiy():owner())
Заменен self:GetOwner() на self:GetPlayer()/SetPlayer() там, где это необходимо
This commit is contained in:
kosmik641
2025-11-12 16:14:02 +03:00
parent 499770d9d3
commit 7d046a0638
11 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lua/entities/gmod_subway_base/init.lua
View File

@@ -57,7 +57,7 @@ function ENT:PostEntityPaste(ply,ent,createdEntities)
v[1].NoPhysics = v[2] or nil v[1].NoPhysics = v[2] or nil
-- Assign ownership -- Assign ownership
if IsValid(self:GetOwner()) then v[1]:SetOwner(self:GetOwner()) end if IsValid(self:GetPlayer()) then v[1]:SetPlayer(self:GetPlayer()) end
if CPPI and IsValid(self:CPPIGetOwner()) then v[1]:CPPISetOwner(self:CPPIGetOwner()) end if CPPI and IsValid(self:CPPIGetOwner()) then v[1]:CPPISetOwner(self:CPPIGetOwner()) end
-- Some shared general information about the bogey -- Some shared general information about the bogey
@@ -107,7 +107,7 @@ function ENT:Initialize()
self:SetUseType(SIMPLE_USE) self:SetUseType(SIMPLE_USE)
-- Prop-protection related -- Prop-protection related
if IsValid(self.Owner) then if IsValid(self.Owner) then
self:SetOwner(self.Owner) self:SetPlayer(self.Owner)
if CPPI then self:CPPISetOwner(self.Owner) end if CPPI then self:CPPISetOwner(self.Owner) end
end end
-- Entities that belong to train and must be cleaned up later -- Entities that belong to train and must be cleaned up later
@@ -1034,7 +1034,7 @@ function ENT:CreateBogey(pos,ang,forward,typ)
bogey:Spawn() bogey:Spawn()
-- Assign ownership -- Assign ownership
if IsValid(self:GetOwner()) then bogey:SetOwner(self:GetOwner()) end if IsValid(self:GetPlayer()) then bogey:SetPlayer(self:GetPlayer()) end
if CPPI and IsValid(self:CPPIGetOwner()) then bogey:CPPISetOwner(self:CPPIGetOwner()) end if CPPI and IsValid(self:CPPIGetOwner()) then bogey:CPPISetOwner(self:CPPIGetOwner()) end
-- Some shared general information about the bogey -- Some shared general information about the bogey
@@ -1072,7 +1072,7 @@ function ENT:CreateBogey(pos,ang,forward,typ)
end end
function ENT:AddLightSensor(pos,ang,model) function ENT:AddLightSensor(pos,ang,model)
local sensor = ents.Create("gmod_train_autodrive_coil") local sensor = ents.Create("gmod_train_autodrive_coil")
if IsValid(self:GetOwner()) then sensor:SetOwner(self:GetOwner()) end if IsValid(self:GetPlayer()) then sensor:SetPlayer(self:GetPlayer()) end
if CPPI and IsValid(self:CPPIGetOwner()) then sensor:CPPISetOwner(self:CPPIGetOwner()) end if CPPI and IsValid(self:CPPIGetOwner()) then sensor:CPPISetOwner(self:CPPIGetOwner()) end
sensor:SetPos(self:LocalToWorld(pos)) sensor:SetPos(self:LocalToWorld(pos))
sensor:SetAngles(self:LocalToWorldAngles(ang)) sensor:SetAngles(self:LocalToWorldAngles(ang))
@@ -1095,7 +1095,7 @@ function ENT:AddAutodriveCoil(bogey,right)
bogey.CoilL = coil bogey.CoilL = coil
end end
-- Assign ownership -- Assign ownership
if IsValid(self:GetOwner()) then coil:SetOwner(self:GetOwner()) end if IsValid(self:GetPlayer()) then coil:SetPlayer(self:GetPlayer()) end
if CPPI and IsValid(self:CPPIGetOwner()) then coil:CPPISetOwner(self:CPPIGetOwner()) end if CPPI and IsValid(self:CPPIGetOwner()) then coil:CPPISetOwner(self:CPPIGetOwner()) end
end end
if right then if right then
@@ -1121,7 +1121,7 @@ function ENT:CreateCouple(pos,ang,forward,typ)
coupler:Spawn() coupler:Spawn()
-- Assign ownership -- Assign ownership
if IsValid(self:GetOwner()) then coupler:SetOwner(self:GetOwner()) end if IsValid(self:GetPlayer()) then coupler:SetPlayer(self:GetPlayer()) end
if CPPI and IsValid(self:CPPIGetOwner()) then coupler:CPPISetOwner(self:CPPIGetOwner()) end if CPPI and IsValid(self:CPPIGetOwner()) then coupler:CPPISetOwner(self:CPPIGetOwner()) end
-- Some shared general information about the bogey -- Some shared general information about the bogey
@@ -1194,7 +1194,7 @@ function ENT:CreateSeatEntity(seat_info)
self:DrawShadow(false) self:DrawShadow(false)
--Assign ownership --Assign ownership
if IsValid(self:GetOwner()) then seat:SetOwner(self:GetOwner()) end if IsValid(self:GetPlayer()) then seat:SetOwner(self:GetPlayer()) end
if CPPI and IsValid(self:CPPIGetOwner()) then seat:CPPISetOwner(self:CPPIGetOwner()) end if CPPI and IsValid(self:CPPIGetOwner()) then seat:CPPISetOwner(self:CPPIGetOwner()) end
-- Hide the entity visually -- Hide the entity visually

2
lua/entities/gmod_subway_base/shared.lua
View File

@@ -1,5 +1,5 @@
ENT.Type = "anim" ENT.Type = "anim"
ENT.Base = "base_gmodentity"
ENT.Author = "" ENT.Author = ""
ENT.Contact = "" ENT.Contact = ""
ENT.Purpose = "" ENT.Purpose = ""

2
lua/entities/gmod_train_autodrive_coil/shared.lua
View File

@@ -1,5 +1,5 @@
ENT.Type = "anim" ENT.Type = "anim"
ENT.Base = "base_gmodentity"
ENT.PrintName = "Autodrive coil" ENT.PrintName = "Autodrive coil"
ENT.Category = "Metrostroi (utility)" ENT.Category = "Metrostroi (utility)"

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

@@ -151,10 +151,10 @@ function ENT:InitializeWheels()
end end
-- Assign ownership -- Assign ownership
if IsValid(self:GetOwner()) then if IsValid(self:GetPlayer()) then
wheels:SetOwner(self:GetOwner()) wheels:SetPlayer(self:GetPlayer())
elseif IsValid(self:GetNW2Entity("TrainEntity"):GetOwner()) then elseif IsValid(self:GetNW2Entity("TrainEntity"):GetPlayer()) then
wheels:SetOwner(self:GetNW2Entity("TrainEntity"):GetOwner()) wheels:SetPlayer(self:GetNW2Entity("TrainEntity"):GetPlayer())
end end
if CPPI and IsValid(self:CPPIGetOwner()) then if CPPI and IsValid(self:CPPIGetOwner()) then

2
lua/entities/gmod_train_bogey/shared.lua
View File

@@ -1,5 +1,5 @@
ENT.Type = "anim" ENT.Type = "anim"
ENT.Base = "base_gmodentity"
ENT.Author = "" ENT.Author = ""
ENT.Contact = "" ENT.Contact = ""
ENT.Purpose = "" ENT.Purpose = ""

2
lua/entities/gmod_train_couple/shared.lua
View File

@@ -1,5 +1,5 @@
ENT.Type = "anim" ENT.Type = "anim"
ENT.Base = "base_gmodentity"
ENT.Author = "" ENT.Author = ""
ENT.Contact = "" ENT.Contact = ""
ENT.Purpose = "" ENT.Purpose = ""

3
lua/entities/gmod_train_special_box/init.lua
View File

@@ -34,11 +34,10 @@ function ENT:Use(_,ply)
self.Cover:SetPos(self:LocalToWorld(Vector(0,0,5.7))) self.Cover:SetPos(self:LocalToWorld(Vector(0,0,5.7)))
self.Cover:SetAngles(self:GetAngles()) self.Cover:SetAngles(self:GetAngles())
self.Cover:Spawn() self.Cover:Spawn()
self.Cover:SetOwner(self.Owner)
local phys = self.Cover:GetPhysicsObject() local phys = self.Cover:GetPhysicsObject()
phys:ApplyForceCenter(self.Cover:GetUp()*phys:GetMass()*40+self.Cover:GetRight()*phys:GetMass()*35 ) phys:ApplyForceCenter(self.Cover:GetUp()*phys:GetMass()*40+self.Cover:GetRight()*phys:GetMass()*35 )
if IsValid(self.Owner) then if IsValid(self.Owner) then
self.Cover:SetOwner(self.Owner) self.Cover:SetPlayer(self.Owner)
if CPPI then self.Cover:CPPISetOwner(self.Owner) end if CPPI then self.Cover:CPPISetOwner(self.Owner) end
end end
if self.Code then self:SetNW2Int("Code",self.Code) end if self.Code then self:SetNW2Int("Code",self.Code) end

2
lua/entities/gmod_train_special_box/shared.lua
View File

@@ -1,5 +1,5 @@
ENT.Type = "anim" ENT.Type = "anim"
ENT.Base = "base_gmodentity"
ENT.PrintName = "Special box" ENT.PrintName = "Special box"
ENT.Author = "" ENT.Author = ""
ENT.Contact = "" ENT.Contact = ""

2
lua/entities/gmod_train_wheels/shared.lua
View File

@@ -1,5 +1,5 @@
ENT.Type = "anim" ENT.Type = "anim"
ENT.Base = "base_gmodentity"
ENT.PrintName = "Train Wheels" ENT.PrintName = "Train Wheels"
ENT.Author = "" ENT.Author = ""
ENT.Contact = "" ENT.Contact = ""

2
lua/metrostroi/sv_debugger.lua
View File

@@ -60,7 +60,7 @@ concommand.Add("metrostroi_debugtrainsystems", cmdinithandler, nil, "Add aimed a
-- Automatically engage debugger for train owner -- Automatically engage debugger for train owner
function Metrostroi.DebugTrain(train,ply) function Metrostroi.DebugTrain(train,ply)
if not ply then ply = train:GetOwner() end if not ply then ply = train:GetPlayer() end
if (not IsValid(train)) or (not IsValid(ply)) then return end if (not IsValid(train)) or (not IsValid(ply)) then return end
AddClient(ply,train) AddClient(ply,train)

4
lua/ulx/modules/sh/metrostroi.lua
View File

@@ -108,7 +108,7 @@ function ulx.trains( calling_ply, ToP )
for k2,ent in pairs(ents) do for k2,ent in pairs(ents) do
if ent.NoTrain or trains[ent] or (ent.FrontTrain and ent.RearTrain) or not ent.WagonList then continue end if ent.NoTrain or trains[ent] or (ent.FrontTrain and ent.RearTrain) or not ent.WagonList then continue end
local owner = CPPI and ent:CPPIGetOwner() or ent:GetOwner() local owner = CPPI and ent:CPPIGetOwner() or ent:GetPlayer()
local canShow = not ToP or ToP == "" or IsValid(owner) and owner:GetName():find(ToP) local canShow = not ToP or ToP == "" or IsValid(owner) and owner:GetName():find(ToP)
if not canShow and not tonumber(ToP) then continue end if not canShow and not tonumber(ToP) then continue end
@@ -181,7 +181,7 @@ function ulx.traingoto( calling_ply, ToP)
for k2,ent in pairs(ents) do for k2,ent in pairs(ents) do
if ent.NoTrain then continue end if ent.NoTrain then continue end
local owner = CPPI and ent:CPPIGetOwner() or ent:GetOwner() local owner = CPPI and ent:CPPIGetOwner() or ent:GetPlayer()
local driver = ent:GetDriver() local driver = ent:GetDriver()
if not ToS and owner == calling_ply and not (ent.FrontTrain and ent.RearTrain) then train = ent break end if not ToS and owner == calling_ply and not (ent.FrontTrain and ent.RearTrain) then train = ent break end
if ToS and driver and driver:GetName():find(ToS) and not ulx.getExclusive(driver,calling_ply) then train = ent break end if ToS and driver and driver:GetName():find(ToS) and not ulx.getExclusive(driver,calling_ply) then train = ent break end