starred/esx_core-esx-framework
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-08-31 20:01:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #25 from ElPumpo/master

Browse Source 
Fixed stack trace caused by fueler job
This commit is contained in:
Don
2018-03-11 18:46:38 -07:00
committed by GitHub
parent e4b7bccea7 40b22051bb
commit 2f6042e457
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esx_jobs.sql
+2 -2
View File
@@ -9,7 +9,7 @@ INSERT INTO `jobs` (name, label) VALUES
('fisherman', 'Pêcheur'),
('miner', 'Mineur'),
('lumberjack', 'Bûcheron'),
('fuel', 'Raffineur'),
('fueler', 'Raffineur'),
('reporter', 'Journaliste'),
('textil', 'Couturier')
;
@@ -19,7 +19,7 @@ ALTER TABLE jobs ADD whitelisted BOOLEAN NOT NULL DEFAULT FALSE;
INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_female) VALUES
('lumberjack', 0, 'interim', 'Intérimaire', 0, '{}', '{}'),
('fisherman', 0, 'interim', 'Intérimaire', 0, '{}', '{}'),
('fuel', 0, 'interim', 'Intérimaire', 0, '{}', '{}'),
('fueler', 0, 'interim', 'Intérimaire', 0, '{}', '{}'),
('reporter', 0, 'employee', 'Intérimaire', 0, '{}', '{}'),
('textil',0,'interim','Intérimaire',0,'{\"mask_1\":0,\"arms\":1,\"glasses_1\":0,\"hair_color_2\":4,\"makeup_1\":0,\"face\":19,\"glasses\":0,\"mask_2\":0,\"makeup_3\":0,\"skin\":29,\"helmet_2\":0,\"lipstick_4\":0,\"sex\":0,\"torso_1\":24,\"makeup_2\":0,\"bags_2\":0,\"chain_2\":0,\"ears_1\":-1,\"bags_1\":0,\"bproof_1\":0,\"shoes_2\":0,\"lipstick_2\":0,\"chain_1\":0,\"tshirt_1\":0,\"eyebrows_3\":0,\"pants_2\":0,\"beard_4\":0,\"torso_2\":0,\"beard_2\":6,\"ears_2\":0,\"hair_2\":0,\"shoes_1\":36,\"tshirt_2\":0,\"beard_3\":0,\"hair_1\":2,\"hair_color_1\":0,\"pants_1\":48,\"helmet_1\":-1,\"bproof_2\":0,\"eyebrows_4\":0,\"eyebrows_2\":0,\"decals_1\":0,\"age_2\":0,\"beard_1\":5,\"shoes\":10,\"lipstick_1\":0,\"eyebrows_1\":0,\"glasses_2\":0,\"makeup_4\":0,\"decals_2\":0,\"lipstick_3\":0,\"age_1\":0}','{\"mask_1\":0,\"arms\":5,\"glasses_1\":5,\"hair_color_2\":4,\"makeup_1\":0,\"face\":19,\"glasses\":0,\"mask_2\":0,\"makeup_3\":0,\"skin\":29,\"helmet_2\":0,\"lipstick_4\":0,\"sex\":1,\"torso_1\":52,\"makeup_2\":0,\"bags_2\":0,\"chain_2\":0,\"ears_1\":-1,\"bags_1\":0,\"bproof_1\":0,\"shoes_2\":1,\"lipstick_2\":0,\"chain_1\":0,\"tshirt_1\":23,\"eyebrows_3\":0,\"pants_2\":0,\"beard_4\":0,\"torso_2\":0,\"beard_2\":6,\"ears_2\":0,\"hair_2\":0,\"shoes_1\":42,\"tshirt_2\":4,\"beard_3\":0,\"hair_1\":2,\"hair_color_1\":0,\"pants_1\":36,\"helmet_1\":-1,\"bproof_2\":0,\"eyebrows_4\":0,\"eyebrows_2\":0,\"decals_1\":0,\"age_2\":0,\"beard_1\":5,\"shoes\":10,\"lipstick_1\":0,\"eyebrows_1\":0,\"glasses_2\":0,\"makeup_4\":0,\"decals_2\":0,\"lipstick_3\":0,\"age_1\":0}'),
('miner', 0, 'interim', 'Intérimaire', 0, '{"tshirt_2":1,"ears_1":8,"glasses_1":15,"torso_2":0,"ears_2":2,"glasses_2":3,"shoes_2":1,"pants_1":75,"shoes_1":51,"bags_1":0,"helmet_2":0,"pants_2":7,"torso_1":71,"tshirt_1":59,"arms":2,"bags_2":0,"helmet_1":0}', '{}'),
localization/br_esx_jobs.sql
+2 -2
View File
@@ -9,7 +9,7 @@ INSERT INTO `jobs` (name, label) VALUES
('fisherman', 'Pescador'),
('miner', 'Minerador'),
('lumberjack', 'Lenhador'),
('fuel', 'Refinador'),
('fueler', 'Refinador'),
('reporter', 'Jornalista'),
('textil', 'Costureiro')
;
@@ -19,7 +19,7 @@ ALTER TABLE jobs ADD whitelisted BOOLEAN NOT NULL DEFAULT FALSE;
INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_female) VALUES
('lumberjack', 0, 'interim', 'Temporario', 0, '{}', '{}'),
('fisherman', 0, 'interim', 'Temporario', 0, '{}', '{}'),
('fuel', 0, 'interim', 'Temporario', 0, '{}', '{}'),
('fueler', 0, 'interim', 'Temporario', 0, '{}', '{}'),
('reporter', 0, 'employee', 'Temporario', 0, '{}', '{}'),
('textil',0,'interim','Temporario',0,'{\"mask_1\":0,\"arms\":1,\"glasses_1\":0,\"hair_color_2\":4,\"makeup_1\":0,\"face\":19,\"glasses\":0,\"mask_2\":0,\"makeup_3\":0,\"skin\":29,\"helmet_2\":0,\"lipstick_4\":0,\"sex\":0,\"torso_1\":24,\"makeup_2\":0,\"bags_2\":0,\"chain_2\":0,\"ears_1\":-1,\"bags_1\":0,\"bproof_1\":0,\"shoes_2\":0,\"lipstick_2\":0,\"chain_1\":0,\"tshirt_1\":0,\"eyebrows_3\":0,\"pants_2\":0,\"beard_4\":0,\"torso_2\":0,\"beard_2\":6,\"ears_2\":0,\"hair_2\":0,\"shoes_1\":36,\"tshirt_2\":0,\"beard_3\":0,\"hair_1\":2,\"hair_color_1\":0,\"pants_1\":48,\"helmet_1\":-1,\"bproof_2\":0,\"eyebrows_4\":0,\"eyebrows_2\":0,\"decals_1\":0,\"age_2\":0,\"beard_1\":5,\"shoes\":10,\"lipstick_1\":0,\"eyebrows_1\":0,\"glasses_2\":0,\"makeup_4\":0,\"decals_2\":0,\"lipstick_3\":0,\"age_1\":0}','{\"mask_1\":0,\"arms\":5,\"glasses_1\":5,\"hair_color_2\":4,\"makeup_1\":0,\"face\":19,\"glasses\":0,\"mask_2\":0,\"makeup_3\":0,\"skin\":29,\"helmet_2\":0,\"lipstick_4\":0,\"sex\":1,\"torso_1\":52,\"makeup_2\":0,\"bags_2\":0,\"chain_2\":0,\"ears_1\":-1,\"bags_1\":0,\"bproof_1\":0,\"shoes_2\":1,\"lipstick_2\":0,\"chain_1\":0,\"tshirt_1\":23,\"eyebrows_3\":0,\"pants_2\":0,\"beard_4\":0,\"torso_2\":0,\"beard_2\":6,\"ears_2\":0,\"hair_2\":0,\"shoes_1\":42,\"tshirt_2\":4,\"beard_3\":0,\"hair_1\":2,\"hair_color_1\":0,\"pants_1\":36,\"helmet_1\":-1,\"bproof_2\":0,\"eyebrows_4\":0,\"eyebrows_2\":0,\"decals_1\":0,\"age_2\":0,\"beard_1\":5,\"shoes\":10,\"lipstick_1\":0,\"eyebrows_1\":0,\"glasses_2\":0,\"makeup_4\":0,\"decals_2\":0,\"lipstick_3\":0,\"age_1\":0}'),
('miner', 0, 'interim', 'Temporario', 0, '{"tshirt_2":1,"ears_1":8,"glasses_1":15,"torso_2":0,"ears_2":2,"glasses_2":3,"shoes_2":1,"pants_1":75,"shoes_1":51,"bags_1":0,"helmet_2":0,"pants_2":7,"torso_1":71,"tshirt_1":59,"arms":2,"bags_2":0,"helmet_1":0}', '{}'),
localization/de_esx_jobs.sql
+2 -2
View File
@@ -9,7 +9,7 @@ INSERT INTO `jobs` (name, label) VALUES
('fisherman', 'Fischerei'),
('miner', 'Bergbau'),
('lumberjack', 'Holzbetrieb'),
('fuel', 'Raffinerie'),
('fueler', 'Raffinerie'),
('reporter', 'Kanal 7'),
('textil', 'Schneiderei')
;
@@ -19,7 +19,7 @@ ALTER TABLE jobs ADD whitelisted BOOLEAN NOT NULL DEFAULT FALSE;
INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_female) VALUES
('lumberjack', 0, 'interim', 'Mitarbeiter', 0, '{}', '{}'),
('fisherman', 0, 'interim', 'Mitarbeiter', 0, '{}', '{}'),
('fuel', 0, 'interim', 'Mitarbeiter', 0, '{}', '{}'),
('fueler', 0, 'interim', 'Mitarbeiter', 0, '{}', '{}'),
('reporter', 0, 'employee', 'Mitarbeiter', 0, '{}', '{}'),
('textil', 0, 'interim', 'Mitarbeiter', 0, '{}', '{}'),
('miner', 0, 'interim', 'Mitarbeiter', 0, '{}', '{}'),
localization/en_esx_jobs.sql
+1 -1
View File
@@ -9,7 +9,7 @@ INSERT INTO `jobs` (name, label) VALUES
('fisherman', 'Fisherman'),
('miner', 'Miner'),
('lumberjack', 'Lumberjack'),
('fuel', 'Fueler'),
('fueler', 'Fueler'),
('reporter', 'Reporter'),
('tailor', 'Tailor')
;