Bug fixes for zone loading

master
E. Almqvist 5 years ago
parent 62437360b7
commit 40ea6e828e
  1. 4
      entities/weapons/quantum_hands/shared.lua
  2. 1
      gamemode/cl_init.lua
  3. 3
      gamemode/init.lua
  4. 2
      gamemode/settings/sh_properties.lua

@ -109,9 +109,9 @@ function SWEP:SecondaryAttack()
if SERVER then if SERVER then
local hitposEnt = self:GetOwner():GetEyeTraceNoCursor().Entity local hitposEnt = self:GetOwner():GetEyeTraceNoCursor().Entity
if( Quantum.Server.DoorClasses[hitposEnt:GetClass()] && IsValid(hitposEnt) ) then -- if it is a door if( Quantum.DoorClasses[hitposEnt:GetClass()] && IsValid(hitposEnt) ) then -- if it is a door
if( hitposEnt:GetPos():Distance(self:GetOwner():GetPos()) <= 90 ) then if( hitposEnt:GetPos():Distance(self:GetOwner():GetPos()) <= 90 ) then
Quantum.Server.Property.PlayerSwitchLock( self:GetOwner(), hitposEnt ) -- then try to unlock/lock it Quantum.Property.PlayerSwitchLock( self:GetOwner(), hitposEnt ) -- then try to unlock/lock it
end end
end end
end end

@ -52,6 +52,7 @@ if CLIENT then
include( "settings/sh_crafting_stations.lua" ) include( "settings/sh_crafting_stations.lua" )
include( "settings/sh_recipes.lua" ) include( "settings/sh_recipes.lua" )
include( "settings/sh_nodes.lua" ) include( "settings/sh_nodes.lua" )
include( "settings/sh_properties.lua" )
end end
local function loadPlugins() local function loadPlugins()

@ -17,6 +17,7 @@ if SERVER then
AddCSLuaFile( "settings/sh_recipes.lua" ) AddCSLuaFile( "settings/sh_recipes.lua" )
AddCSLuaFile( "settings/sh_crafting_stations.lua" ) AddCSLuaFile( "settings/sh_crafting_stations.lua" )
AddCSLuaFile( "settings/sh_nodes.lua" ) AddCSLuaFile( "settings/sh_nodes.lua" )
AddCSLuaFile( "settings/sh_properties.lua" )
AddCSLuaFile( "cl_init.lua" ) AddCSLuaFile( "cl_init.lua" )
AddCSLuaFile( "shared.lua" ) AddCSLuaFile( "shared.lua" )
@ -123,7 +124,7 @@ if SERVER then
include( "settings/sv_crafting_stations_locations.lua" ) include( "settings/sv_crafting_stations_locations.lua" )
include( "settings/sh_nodes.lua" ) include( "settings/sh_nodes.lua" )
include( "settings/sv_nodes_locations.lua" ) include( "settings/sv_nodes_locations.lua" )
include( "settings/sv_properties.lua" ) include( "settings/sh_properties.lua" )
Quantum.Server.Station.UpdateAll() Quantum.Server.Station.UpdateAll()
end end

@ -5,7 +5,7 @@
-- \ \ / ____ \| | | | | | | | __/ (__| | | | / / -- \ \ / ____ \| | | | | | | | __/ (__| | | | / /
-- \_\ /_/ \_\_|_| |_| |_|_|\___|\___|_| |_| /_/ -- \_\ /_/ \_\_|_| |_| |_|_|\___|\___|_| |_| /_/
Quantum.Server.Property.Register( "house1", { Quantum.Property.Register( "house1", {
name = "Red House", name = "Red House",
price = 10000, price = 10000,
vec1 = Vector( 761.43292236328, -3089.3618164063, 200.19812011719 ), vec1 = Vector( 761.43292236328, -3089.3618164063, 200.19812011719 ),

Loading…
Cancel
Save