Fixed db2 loading, and world login.

2023-01-11 16:38:29 -05:00
parent dd8d17a4da
commit 3dad3747ce
8 changed files with 34 additions and 65 deletions
@@ -88,7 +88,7 @@ namespace Game.Entities
            if (SpellEffectsHandlers.Count == 0)
            {
                Log.outFatal(LogFilter.ServerLoading, "Could'nt find any SpellEffectHandlers. Dev needs to check this out.");
-                Global.WorldMgr.ShutdownServ(0, ShutdownMask.Force, ShutdownExitCode.Error);
+                Environment.Exit(1);
            }
        }

@@ -2724,6 +2724,9 @@ namespace Game.Entities
                            {
                                uint enchantId = (uint)spellEffectInfo.MiscValue;
                                var enchant = CliDB.SpellItemEnchantmentStorage.LookupByKey(enchantId);
+                                if (enchant == null)
+                                    break;
+
                                for (var s = 0; s < ItemConst.MaxItemEnchantmentEffects; ++s)
                                {
                                    if (enchant.Effect[s] != ItemEnchantmentType.CombatSpell)