From 868765ec1d7be319c739cfad4e0228e5ab4aebbf Mon Sep 17 00:00:00 2001 From: A Man Date: Sun, 20 Mar 2022 18:26:50 +0100 Subject: [PATCH] Update SQL events for all new objects --- .../SQL/add_recommended_mysql_events.sql | 24 +++++++++++++++++-- Server Files/SQL/epoch.sql | 2 +- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/Server Files/SQL/add_recommended_mysql_events.sql b/Server Files/SQL/add_recommended_mysql_events.sql index d618defd4..504857ad3 100644 --- a/Server Files/SQL/add_recommended_mysql_events.sql +++ b/Server Files/SQL/add_recommended_mysql_events.sql @@ -65,7 +65,17 @@ BEGIN AND `Object_DATA`.`Classname` NOT LIKE '%Bench%' AND `Object_DATA`.`Classname` NOT LIKE 'Vendmachine%' AND `Object_DATA`.`Classname` NOT LIKE '%Trap%' - AND `Object_DATA`.`Classname` NOT IN ('Arcade_DZ','Sofa_DZ','Armchair_DZ','ATM_DZ','Server_Rack_DZ','Washing_Machine_DZ','Fridge_DZ','Wardrobe_DZ','Commode_DZ','Stoneoven_DZ','CookTripod_DZ','CCTV_DZ','Office_Chair_DZ','Table_DZ','Bed_DZ','Water_Pump_DZ','Water_Pump_DZ','Notebook_DZ','Scaffolding_DZ','OutHouse_DZ','Sandbag1_DZ', 'FireBarrel_DZ', 'StickFence_DZ', 'LightPole_DZ', 'DeerStand_DZ', 'Plastic_Pole_EP1_DZ', 'Hedgehog_DZ', 'FuelPump_DZ', 'Fort_RazorWire', 'SandNest_DZ', 'Fence_corrugated_DZ', 'CanvasHut_DZ', 'Generator_DZ', 'BagFenceRound_DZ') + AND `Object_DATA`.`Classname` NOT LIKE 'GunRack%' + AND `Object_DATA`.`Classname` NOT LIKE '%_Static_DZ' + AND `Object_DATA`.`Classname` NOT LIKE 'Plant_%' + AND `Object_DATA`.`Classname` NOT LIKE 'Compost_Barrel_%' + AND `Object_DATA`.`Classname` NOT LIKE 'DragonTeeth_%' + AND `Object_DATA`.`Classname` NOT LIKE '%Footbridge_DZ' + AND `Object_DATA`.`Classname` NOT LIKE 'HeavyBagFence%' + AND `Object_DATA`.`Classname` NOT LIKE 'SandNest%' + AND `Object_DATA`.`Classname` NOT LIKE 'StorageBarrel%' + AND `Object_DATA`.`Classname` NOT LIKE '%Crate_DZ' + AND `Object_DATA`.`Classname` NOT IN ('Watertower_DZE','Watertank_DZE','Fueltank_DZE','Satellite_Dish_DZE','Boggle_DZE','Postbox_DZE','Doghouse_DZE','Chicken_Coop_DZE','Rabbit_Hutch_DZE','Windbreak_DZ','BarbedGate_DZ','FortifiedWire_DZ','Arcade_DZ','Sofa_DZ','Armchair_DZ','ATM_DZ','Server_Rack_DZ','Washing_Machine_DZ','Fridge_DZ','Wardrobe_DZ','Commode_DZ','Stoneoven_DZ','CookTripod_DZ','CCTV_DZ','Office_Chair_DZ','Table_DZ','Bed_DZ','Water_Pump_DZ','Greenhouse_DZ','Notebook_DZ','Scaffolding_DZ','OutHouse_DZ','Sandbag1_DZ', 'FireBarrel_DZ', 'StickFence_DZ', 'LightPole_DZ', 'DeerStand_DZ', 'Plastic_Pole_EP1_DZ', 'Hedgehog_DZ', 'FuelPump_DZ', 'Fort_RazorWire', 'Fence_corrugated_DZ', 'CanvasHut_DZ', 'Generator_DZ', 'BagFenceRound_DZ') AND FindVehicleKeysCount(Object_DATA.CharacterID) = 0; RETURN ROW_COUNT(); @@ -138,7 +148,17 @@ CREATE EVENT `UnlockNonKeyVehicles` ON SCHEDULE EVERY 1 DAY DO UPDATE AND `Object_DATA`.`Classname` NOT LIKE '%Bench%' AND `Object_DATA`.`Classname` NOT LIKE 'Vendmachine%' AND `Object_DATA`.`Classname` NOT LIKE '%Trap%' - AND `Object_DATA`.`Classname` NOT IN ('Arcade_DZ','Sofa_DZ','Armchair_DZ','ATM_DZ','Server_Rack_DZ','Washing_Machine_DZ','Fridge_DZ','Wardrobe_DZ','Commode_DZ','Stoneoven_DZ','CookTripod_DZ','CCTV_DZ','Office_Chair_DZ','Table_DZ','Bed_DZ','Water_Pump_DZ','Water_Pump_DZ','Notebook_DZ','Scaffolding_DZ','OutHouse_DZ','Sandbag1_DZ', 'FireBarrel_DZ', 'StickFence_DZ', 'LightPole_DZ', 'DeerStand_DZ', 'Plastic_Pole_EP1_DZ', 'Hedgehog_DZ', 'FuelPump_DZ', 'Fort_RazorWire', 'SandNest_DZ', 'Fence_corrugated_DZ', 'CanvasHut_DZ', 'Generator_DZ', 'BagFenceRound_DZ') + AND `Object_DATA`.`Classname` NOT LIKE 'GunRack%' + AND `Object_DATA`.`Classname` NOT LIKE '%_Static_DZ' + AND `Object_DATA`.`Classname` NOT LIKE 'Plant_%' + AND `Object_DATA`.`Classname` NOT LIKE 'Compost_Barrel_%' + AND `Object_DATA`.`Classname` NOT LIKE 'DragonTeeth_%' + AND `Object_DATA`.`Classname` NOT LIKE '%Footbridge_DZ' + AND `Object_DATA`.`Classname` NOT LIKE 'HeavyBagFence%' + AND `Object_DATA`.`Classname` NOT LIKE 'SandNest%' + AND `Object_DATA`.`Classname` NOT LIKE 'StorageBarrel%' + AND `Object_DATA`.`Classname` NOT LIKE '%Crate_DZ' + AND `Object_DATA`.`Classname` NOT IN ('Watertower_DZE','Watertank_DZE','Fueltank_DZE','Satellite_Dish_DZE','Boggle_DZE','Postbox_DZE','Doghouse_DZE','Chicken_Coop_DZE','Rabbit_Hutch_DZE','Windbreak_DZ','BarbedGate_DZ','FortifiedWire_DZ','Arcade_DZ','Sofa_DZ','Armchair_DZ','ATM_DZ','Server_Rack_DZ','Washing_Machine_DZ','Fridge_DZ','Wardrobe_DZ','Commode_DZ','Stoneoven_DZ','CookTripod_DZ','CCTV_DZ','Office_Chair_DZ','Table_DZ','Bed_DZ','Water_Pump_DZ','Greenhouse_DZ','Notebook_DZ','Scaffolding_DZ','OutHouse_DZ','Sandbag1_DZ', 'FireBarrel_DZ', 'StickFence_DZ', 'LightPole_DZ', 'DeerStand_DZ', 'Plastic_Pole_EP1_DZ', 'Hedgehog_DZ', 'FuelPump_DZ', 'Fort_RazorWire', 'Fence_corrugated_DZ', 'CanvasHut_DZ', 'Generator_DZ', 'BagFenceRound_DZ') AND FindVehicleKeysCount(Object_DATA.CharacterID) = 0 ;; DELIMITER ; diff --git a/Server Files/SQL/epoch.sql b/Server Files/SQL/epoch.sql index 2091cc94c..385964b53 100644 --- a/Server Files/SQL/epoch.sql +++ b/Server Files/SQL/epoch.sql @@ -138,7 +138,7 @@ CREATE TABLE IF NOT EXISTS `garage` ( -- ---------------------------- /* -THIS PROCEDURE IS REQUIRED FOR 1062 AND RETURNS THE OBJECT ID MUCH MORE EFFICENTLY THAN THE METHOD IN 1061 SQF +THIS PROCEDURE IS REQUIRED FOR 1071 AND RETURNS THE OBJECT ID MUCH MORE EFFICENTLY THAN THE METHOD IN 1061 SQF */ DROP procedure IF EXISTS `retObjID`;