From 60d44d7f895267fd5cca997cf3583448e2dc69bb Mon Sep 17 00:00:00 2001 From: Nick Date: Sun, 31 Jan 2016 15:44:07 -0800 Subject: [PATCH] Completely bypass enabled ritual map This should work, but just in case. --- .../bloodmagic/api/registry/ImperfectRitualRegistry.java | 7 +------ .../WayofTime/bloodmagic/api/registry/RitualRegistry.java | 8 +------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/ImperfectRitualRegistry.java b/src/main/java/WayofTime/bloodmagic/api/registry/ImperfectRitualRegistry.java index 10f9f2f5..64e42888 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/ImperfectRitualRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/api/registry/ImperfectRitualRegistry.java @@ -72,12 +72,7 @@ public class ImperfectRitualRegistry { try { - if (!enabledRituals.containsKey(imperfectRitual)) - { - return true; - } - - return enabledRituals.get(imperfectRitual); + return true; } catch (NullPointerException e) { BloodMagicAPI.getLogger().error("Invalid Imperfect Ritual was called"); diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/RitualRegistry.java b/src/main/java/WayofTime/bloodmagic/api/registry/RitualRegistry.java index f0920ee0..1238a780 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/RitualRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/api/registry/RitualRegistry.java @@ -67,13 +67,7 @@ public class RitualRegistry { try { - //TODO: Fix the Enabled Rituals map so that the config loads properly. - if (!enabledRituals.containsKey(ritual)) - { - return true; - } - - return enabledRituals.get(ritual); + return true; } catch (NullPointerException e) { BloodMagicAPI.getLogger().error("Invalid Ritual was called");