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

Merge pull request #386 from Arcaratus/master

Browse source 
Fixed Ritual Dismantler
This commit is contained in:
WayofTime 2015-07-16 09:31:56 -04:00
commit 77ae114b02
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDismantler.java
View file

@ -58,7 +58,8 @@ public class ItemRitualDismantler extends EnergyItems
int direction = masterStone.getDirection(); int direction = masterStone.getDirection();
int freeSpace = -1; int freeSpace = -1;
List<RitualComponent> ritualList = Rituals.getRitualList(masterStone.getCurrentRitual()); String ritualName = Rituals.checkValidRitual(world, x, y, z);
List<RitualComponent> ritualList = Rituals.getRitualList(ritualName);
if (ritualList == null) if (ritualList == null)
{ {
return false; return false;
@ -86,15 +87,13 @@ public class ItemRitualDismantler extends EnergyItems
if (world.isRemote) if (world.isRemote)
{ {
world.playAuxSFX(2005, x, y + 1, z, 0); world.playAuxSFX(2005, x, y + 1, z, 0);
return true;
} }
} }
return true;
} }
} }
} }
return true;
} }
return false; return false;