Synchronization fixes.

database/dbc/DbcDatabaseManager.py

@@ -236,6 +236,14 @@ def spell_duration_get_by_id(duration_index):
         dbc_db_session.close()
         return res
 
+    @staticmethod
+    @lru_cache
+    def spell_shapeshift_form_get_by_id(form_id):
+        dbc_db_session = SessionHolder()
+        res = dbc_db_session.query(SpellShapeshiftForm).filter_by(ID=form_id).first()
+        dbc_db_session.close()
+        return res
+
     @staticmethod
     @lru_cache
     def spell_radius_get_by_id(radius_index):

etc/config/config.yml.dist

@@ -1,5 +1,5 @@
 Version:
-    current: 24
+    current: 25
 
 Database:
     Auth:
@@ -110,6 +110,7 @@ World:
     Gameplay:
         game_speed: 0.016666668
         enable_call_for_help: False  # Until 0.5.4, creatures didn't call for help when fleeing.
+        use_spline_for_chairs: True  # Avoids player nudge upon using chairs/benches.
         enable_slime_lava_damage: False
         enable_slime_fishing: False  # Until 0.5.4, slime was not fishable.
 

game/world/WorldLoader.py

@@ -7,107 +7,143 @@
 from game.world.managers.objects.units.player.GroupManager import GroupManager
 from game.world.managers.objects.units.player.guild.GuildManager import GuildManager
 from utils.ConfigManager import config
-from utils.Logger import Logger
+from utils.Logger import Logger, AbortLoading
 from utils.constants.ConditionCodes import ConditionType
 
 
 class WorldLoader:
+    _shared_state = None
 
     @staticmethod
-    def load_data():
+    def _should_abort():
+        return WorldLoader._shared_state is not None and not WorldLoader._shared_state.RUNNING
+
+    @staticmethod
+    def load_data(shared_state=None):
+        WorldLoader._shared_state = shared_state
+        Logger.set_abort_check(WorldLoader._should_abort)
+        completed = False
         # Below order matters.
-        WorldLoader.load_creature_templates()
-        WorldLoader.load_gameobject_templates()
-
-        # Loot related, even if not loading creatures or gameobjects, loot might be referenced.
-        WorldLoader.load_gameobject_loot_templates()
-        WorldLoader.load_fishing_loot_templates()
-        WorldLoader.load_creature_loot_templates()
-        WorldLoader.load_skinning_loot_templates()
-        WorldLoader.load_item_templates()
-        WorldLoader.load_reference_loot_templates()
-        WorldLoader.load_pickpocketing_loot_templates()
-        WorldLoader.load_item_loot_templates()
-
-        # Unit class level stats.
-        WorldLoader.load_player_class_level_stats()
-        WorldLoader.load_creature_class_level_stats()
-
-        # Spells.
-        WorldLoader.load_spells()
-        WorldLoader.load_spell_script_targets()
-        WorldLoader.load_creature_spells()
-
-        #  Scripts.
-        WorldLoader.load_event_scripts()
-        WorldLoader.load_generic_scripts()
-
-        # Gameobject spawns
-        if config.Server.Settings.load_gameobjects:
-            WorldLoader.load_transport_animations()
-            WorldLoader.load_gameobject_quest_starters()
-            WorldLoader.load_gameobject_quest_finishers()
-            WorldLoader.load_gameobject_scripts()
-        else:
-            Logger.info('Skipped game object loading.')
-
-        # Creature spawns
-        if config.Server.Settings.load_creatures:
-            WorldLoader.load_creature_movement_scripts()
-            WorldLoader.load_creature_ai_events()
-            WorldLoader.load_creature_ai_scripts()
-            WorldLoader.load_creature_movement()
-            WorldLoader.load_creature_movement_templates()
-            WorldLoader.load_creature_movement_special()
-            WorldLoader.load_creature_groups()
-            WorldLoader.load_creature_equip_templates()
-            WorldLoader.load_creature_on_kill_reputation()
-            WorldLoader.load_creature_quest_starters()
-            WorldLoader.load_creature_quest_finishers()
-            WorldLoader.load_creature_model_info()
-            WorldLoader.load_creature_families()
-        else:
-            Logger.info('Skipped creature loading.')
-
-        # Pools.
-        WorldLoader.load_pool_pool()
-        WorldLoader.load_pool_templates()
-        WorldLoader.load_pool_creatures()
-        WorldLoader.load_pool_creature_templates()
-        WorldLoader.load_pool_gameobjects()
-        WorldLoader.load_pool_gameobject_templates()
-
-        # Gossip/Text related.
-        WorldLoader.load_gossip_menus()
-        WorldLoader.load_npc_gossip()
-        WorldLoader.load_npc_text()
-        WorldLoader.load_broadcast_text()
-
-        WorldLoader.load_area_trigger_quest_relations()
-        WorldLoader.load_quests()
-        WorldLoader.load_spell_chains()
-        WorldLoader.load_default_profession_spells()
-        WorldLoader.load_trainer_spells()
-        WorldLoader.load_skills()
-        WorldLoader.load_skill_line_abilities()
-        WorldLoader.load_char_base_infos()
-        WorldLoader.load_taxi_nodes()
-        WorldLoader.load_taxi_path_nodes()
-        WorldLoader.load_factions()
-        WorldLoader.load_faction_templates()
-        WorldLoader.load_locks()
-        WorldLoader.load_conditions()
-        WorldLoader.load_quest_conditions_items()
-        WorldLoader.load_mdx_models_data()
-        WorldLoader.load_creature_display_info()
-
-        # Character related data
-        WorldLoader.load_groups()
-        WorldLoader.load_guilds()
-
-        # Maps.
-        MapManager.initialize_world_and_pvp_maps()
-        MapManager.initialize_area_tables()
+        try:
+            WorldLoader.load_creature_templates()
+            WorldLoader.load_gameobject_templates()
+
+            # Loot related, even if not loading creatures or gameobjects, loot might be referenced.
+            WorldLoader.load_gameobject_loot_templates()
+            WorldLoader.load_fishing_loot_templates()
+            WorldLoader.load_creature_loot_templates()
+            WorldLoader.load_skinning_loot_templates()
+            WorldLoader.load_item_templates()
+            WorldLoader.load_reference_loot_templates()
+            WorldLoader.load_pickpocketing_loot_templates()
+            WorldLoader.load_item_loot_templates()
+            if WorldLoader._should_abort():
+                return False
+
+            # Unit class level stats.
+            WorldLoader.load_player_class_level_stats()
+            WorldLoader.load_creature_class_level_stats()
+            if WorldLoader._should_abort():
+                return False
+
+            # Spells.
+            WorldLoader.load_spells()
+            WorldLoader.load_spell_script_targets()
+            WorldLoader.load_creature_spells()
+            if WorldLoader._should_abort():
+                return False
+
+            #  Scripts.
+            WorldLoader.load_event_scripts()
+            WorldLoader.load_generic_scripts()
+            if WorldLoader._should_abort():
+                return False
+
+            # Gameobject spawns
+            if config.Server.Settings.load_gameobjects:
+                WorldLoader.load_transport_animations()
+                WorldLoader.load_gameobject_quest_starters()
+                WorldLoader.load_gameobject_quest_finishers()
+                WorldLoader.load_gameobject_scripts()
+            else:
+                Logger.info('Skipped game object loading.')
+            if WorldLoader._should_abort():
+                return False
+
+            # Creature spawns
+            if config.Server.Settings.load_creatures:
+                WorldLoader.load_creature_movement_scripts()
+                WorldLoader.load_creature_ai_events()
+                WorldLoader.load_creature_ai_scripts()
+                WorldLoader.load_creature_movement()
+                WorldLoader.load_creature_movement_templates()
+                WorldLoader.load_creature_movement_special()
+                WorldLoader.load_creature_groups()
+                WorldLoader.load_creature_equip_templates()
+                WorldLoader.load_creature_on_kill_reputation()
+                WorldLoader.load_creature_quest_starters()
+                WorldLoader.load_creature_quest_finishers()
+                WorldLoader.load_creature_model_info()
+                WorldLoader.load_creature_families()
+            else:
+                Logger.info('Skipped creature loading.')
+            if WorldLoader._should_abort():
+                return False
+
+            # Pools.
+            WorldLoader.load_pool_pool()
+            WorldLoader.load_pool_templates()
+            WorldLoader.load_pool_creatures()
+            WorldLoader.load_pool_creature_templates()
+            WorldLoader.load_pool_gameobjects()
+            WorldLoader.load_pool_gameobject_templates()
+            if WorldLoader._should_abort():
+                return False
+
+            # Gossip/Text related.
+            WorldLoader.load_gossip_menus()
+            WorldLoader.load_npc_gossip()
+            WorldLoader.load_npc_text()
+            WorldLoader.load_broadcast_text()
+            if WorldLoader._should_abort():
+                return False
+
+            WorldLoader.load_area_trigger_quest_relations()
+            WorldLoader.load_quests()
+            WorldLoader.load_spell_chains()
+            WorldLoader.load_default_profession_spells()
+            WorldLoader.load_trainer_spells()
+            WorldLoader.load_skills()
+            WorldLoader.load_skill_line_abilities()
+            WorldLoader.load_char_base_infos()
+            WorldLoader.load_taxi_nodes()
+            WorldLoader.load_taxi_path_nodes()
+            WorldLoader.load_factions()
+            WorldLoader.load_faction_templates()
+            WorldLoader.load_locks()
+            WorldLoader.load_conditions()
+            WorldLoader.load_quest_conditions_items()
+            WorldLoader.load_mdx_models_data()
+            WorldLoader.load_creature_display_info()
+            if WorldLoader._should_abort():
+                return False
+
+            # Character related data
+            WorldLoader.load_groups()
+            WorldLoader.load_guilds()
+            if WorldLoader._should_abort():
+                return False
+
+            # Maps.
+            MapManager.initialize_world_and_pvp_maps()
+            MapManager.initialize_area_tables()
+            completed = True
+        except AbortLoading:
+            Logger.info('World loading aborted.')
+            return False
+        finally:
+            Logger.set_abort_check(None)
+        return completed
 
     # World data holders
     @staticmethod