lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #120 from MineMaarten/patch-1

Browse source 
Avoided potential crash when Botania isn't installed.
This commit is contained in:
WayofTime 2014-10-17 12:41:37 -04:00
parent f7b552a3c7 03f03f1ad3
commit 36a4174c36
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
1.7.10/main/java/WayofTime/alchemicalWizardry/common/AlchemicalWizardryEventHooks.java
View file

@ -35,6 +35,7 @@ import cpw.mods.fml.common.ObfuscationReflectionHelper;
import cpw.mods.fml.common.eventhandler.Event.Result; import cpw.mods.fml.common.eventhandler.Event.Result;
import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerRespawnEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerRespawnEvent;
import cpw.mods.fml.common.Optional;
public class AlchemicalWizardryEventHooks public class AlchemicalWizardryEventHooks
{ {
@ -322,7 +323,7 @@ public class AlchemicalWizardryEventHooks
continue; continue;
} }
if (!(projectile instanceof IProjectile) || (projectile instanceof IManaBurst)) if (!(projectile instanceof IProjectile) || (AlchemicalWizardry.isBotaniaLoaded && isManaBurst(projectile)))
{ {
continue; continue;
} }
@ -474,4 +475,10 @@ public class AlchemicalWizardryEventHooks
} }
} }
} }
@Optional.Method(modid = "Botania")
private boolean isManaBurst(Entity projectile)
{
return projectile instanceof IManaBurst;
}
} }