Merge branch 'structsystem'hotfix

1 files changed, 10 insertions, 8 deletions

diff --git a/gamemode/init.lua b/gamemode/init.lua
index 7ba8b25..50006b5 100644
--- a/gamemode/init.lua
+++ b/gamemode/init.lua
@@ -4,6 +4,7 @@ include( "init_static.lua")
 includeFolder("server",true)
 includeFolder("craftablesystem",true)
 includeFolder("itemsystem",true)
+includeFolder("structuresystem",true)
 includeFolder("shared",true)
 
 AddCSLuaFile( "configure_me.lua" )
@@ -11,6 +12,7 @@ AddCSLuaFile( "utility.lua" )
 AddCSLuaFolder("client",true)
 AddCSLuaFolder("craftablesystem",true)
 AddCSLuaFolder("itemsystem",true)
+AddCSLuaFolder("structuresystem",true)
 AddCSLuaFolder("shared",true)
 
 -- Send clientside files
@@ -155,7 +157,7 @@ hook.Add( "InitPostEntity", "gms_custom_antspawns", function()
 		ent:SetPos( pos )
 		ent:Spawn()
 		ent.GMSAutoSpawned = true
-		ent:SetNetworkedString( "Owner", "World" )
+		ent:SetNWString( "Owner", "World" )
 	end
 
 end )
@@ -169,7 +171,7 @@ hook.Add( "InitPostEntity", "gms_custom_treespawns", function()
 		ent:SetPos( pos )
 		ent:Spawn()
 		ent.GMSAutoSpawned = true
-		ent:SetNetworkedString( "Owner", "World" )
+		ent:SetNWString( "Owner", "World" )
 	end
 end )
 
@@ -252,7 +254,7 @@ function GM.ReproduceTrees()
 				seed:SetPos( pos )
 				seed:DropToGround()
 				seed:Setup( "tree", 180 )
-				seed:SetNetworkedString( "Owner", "World" )
+				seed:SetNWString( "Owner", "World" )
 				seed:Spawn()
 			end
 		end
@@ -308,7 +310,7 @@ function GM.ReproduceTrees()
 				seed:SetPos( groundtrace.HitPos )
 				seed:DropToGround()
 				seed:Setup( "tree", 180 + math.random( -20, 20 ) )
-				seed:SetNetworkedString( "Owner", "World" )
+				seed:SetNWString( "Owner", "World" )
 				seed:Spawn()
 			end
 		end
@@ -1235,7 +1237,7 @@ hook.Add( "PlayerDeath", "Death", function( ply )
 	grave:Spawn()
 	grave:SetplName(ply:Nick())
 
-	grave:SetNetworkedString( "Owner", "Everyone" )
+	grave:SetNWString( "Owner", "Everyone" )
 
 	wepstbl = {}
 	restbl = {}
@@ -1800,7 +1802,7 @@ function GM:LoadMapEntity( savegame, max, k )
 		if ( ent.IsPlant ) then ent:SetNWEntity( "plantowner", player.FindByName( entry["owner"] ) ) end
 		SPropProtection.PlayerMakePropOwner( player.FindByName( entry["owner"] ), ent )
 	elseif ( entry["owner"] == "World" ) then
-		ent:SetNetworkedString( "Owner", entry["owner"] )
+		ent:SetNWString( "Owner", entry["owner"] )
 	end
 
 	if ( entry["class"] == "gms_resourcedrop" ) then // RP
@@ -2055,7 +2057,7 @@ function gms_addbuildsiteresource( ent_resourcedrop, ent_buildsite )
 			for k, v in pairs( ent_buildsite.Costs ) do
 				str = str .. " " .. string.Replace( k, "_", " " ) .. " ( " .. v .. "x )"
 			end
-			ent_buildsite:SetNetworkedString( "Resources", str )
+			ent_buildsite:SetNWString( "Resources", str )
 		end
 	end
 end
@@ -2104,7 +2106,7 @@ function gms_addbuildsiteresourcePack( ent_resourcepack, ent_buildsite )
 			for k, v in pairs( ent_buildsite.Costs ) do
 				str = str .. " " .. string.Replace( k, "_", " " ) .. " ( " .. v .. "x )"
 			end
-			ent_buildsite:SetNetworkedString( "Resources", str )
+			ent_buildsite:SetNWString( "Resources", str )
 		end
 	end
 end