willox/gmod-keypad
1
0
Fork 1
mirror of https://github.com/willox/gmod-keypad.git synced 2025-03-04 03:13:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Don't die when calling SetTable after Initialize

Browse Source
This commit is contained in:
William Wallace 2017-02-18 21:20:17 +00:00
parent 8b8bf09079
commit a1397528c2
6 changed files with 65 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lua/entities/keypad/init.lua
View File

@ -58,6 +58,8 @@ function ENT:GetValue()
end
function ENT:Process(granted)
self:GetData()
local length, repeats, delay, initdelay, owner, key
if(granted) then
@ -119,11 +121,35 @@ function ENT:SetData(data)
end
function ENT:GetData()
if not self.KeypadData then
self:SetData( {
Password = 1337,
RepeatsGranted = 0,
RepeatsDenied = 0,
LengthGranted = 0,
LengthDenied = 0,
DelayGranted = 0,
DelayDenied = 0,
InitDelayGranted = 0,
InitDelayDenied = 0,
KeyGranted = 0,
KeyDenied = 0,
Secure = false,
Owner = NULL
} )
end
return self.KeypadData
end
function ENT:Reset()
self:SetValue("")
self:SetStatus(self.Status_None)
self:SetSecure(self.KeypadData.Secure)
self:SetSecure(self:GetData().Secure)
end

25
lua/entities/keypad/sh_init.lua
View File

@ -42,29 +42,8 @@ function ENT:Initialize()
self:SetValue("")
self:SetPassword("1337")
if(not self.KeypadData) then
self:SetData({
Password = 1337,
RepeatsGranted = 0,
RepeatsDenied = 0,
LengthGranted = 0,
LengthDenied = 0,
DelayGranted = 0,
DelayDenied = 0,
InitDelayGranted = 0,
InitDelayDenied = 0,
KeyGranted = 0,
KeyDenied = 0,
Secure = false,
Owner = NULL
})
end
-- Initialize defaults
self:GetData()
self:Reset()
end

32
lua/entities/keypad_wire/init.lua
View File

@ -58,6 +58,8 @@ function ENT:GetValue()
end
function ENT:Process(granted)
self:GetData()
local length, repeats, delay, initdelay, owner, outputKey
if(granted) then
@ -122,7 +124,37 @@ function ENT:GetData()
return self.KeypadData
end
function ENT:GetData()
if not self.KeypadData then
self:SetData( {
Password = false,
RepeatsGranted = 0,
RepeatsDenied = 0,
LengthGranted = 0,
LengthDenied = 0,
DelayGranted = 0,
DelayDenied = 0,
InitDelayGranted = 0,
InitDelayDenied = 0,
OutputOn = 0,
OutputOff = 0,
Secure = false,
Owner = NULL
} )
end
return self.KeypadData
end
function ENT:Reset()
self:GetData()
self:SetValue("")
self:SetStatus(self.Status_None)
self:SetSecure(self.KeypadData.Secure)

25
lua/entities/keypad_wire/sh_init.lua
View File

@ -52,29 +52,8 @@ function ENT:Initialize()
self:SetValue("")
self:SetPassword("1337")
if(not self.KeypadData) then
self:SetData({
Password = false,
RepeatsGranted = 0,
RepeatsDenied = 0,
LengthGranted = 0,
LengthDenied = 0,
DelayGranted = 0,
DelayDenied = 0,
InitDelayGranted = 0,
InitDelayDenied = 0,
OutputOn = 0,
OutputOff = 0,
Secure = false,
Owner = NULL
})
end
-- Initialize defaults
self:GetData()
self:Reset()
end

2
lua/weapons/gmod_tool/stools/keypad_willox.lua
View File

@ -84,7 +84,7 @@ function TOOL:RightClick(tr)
return false
end
if trace_ent.KeypadData.Owner == ply then
if trace_ent:GetData().Owner == ply then
self:SetupKeypad(trace_ent, password)
return true

2
lua/weapons/gmod_tool/stools/keypad_willox_wire.lua
View File

@ -87,7 +87,7 @@ function TOOL:RightClick(tr)
return false
end
if trace_ent.KeypadData.Owner == ply then
if trace_ent:GetData().Owner == ply then
self:SetupKeypad(trace_ent, password)
return true