From c313236eec9e4b95eb747ac10b8d51e105ca9fe9 Mon Sep 17 00:00:00 2001 From: Electroblob77 <35599699+Electroblob77@users.noreply.github.com> Date: Sun, 17 Jan 2021 15:08:34 +0000 Subject: [PATCH] Disable weather forfeit when invoke weather is disabled, closes #554 --- src/main/java/electroblob/wizardry/misc/Forfeit.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/electroblob/wizardry/misc/Forfeit.java b/src/main/java/electroblob/wizardry/misc/Forfeit.java index 3f9da890..819e81b3 100644 --- a/src/main/java/electroblob/wizardry/misc/Forfeit.java +++ b/src/main/java/electroblob/wizardry/misc/Forfeit.java @@ -15,8 +15,10 @@ import electroblob.wizardry.event.SpellCastEvent; import electroblob.wizardry.item.ItemArtefact; import electroblob.wizardry.registry.*; import electroblob.wizardry.spell.Banish; +import electroblob.wizardry.spell.Spell; import electroblob.wizardry.util.BlockUtils; import electroblob.wizardry.util.EntityUtils; +import electroblob.wizardry.util.SpellProperties.Context; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.item.EntityFallingBlock; import net.minecraft.entity.passive.EntitySquid; @@ -296,6 +298,7 @@ public abstract class Forfeit { })); add(Tier.APPRENTICE, Element.LIGHTNING, create("storm", (w, p) -> { + if(!Spells.invoke_weather.isEnabled(Context.WANDS)) return; int standardWeatherTime = (300 + (new Random()).nextInt(600)) * 20; w.getWorldInfo().setRaining(true); w.getWorldInfo().setRainTime(standardWeatherTime);