Merge pull request #551 from grundyboy34/patch-1

Updated RitualEffectGrowth to support non-standard farms
This commit is contained in:
WayofTime 2016-01-08 07:30:13 -05:00
commit 1bb699cb9a

View file

@ -55,11 +55,15 @@ public class RitualEffectGrowth extends RitualEffect
{ {
for (int j = -hydrationRange; j <= hydrationRange; j++) for (int j = -hydrationRange; j <= hydrationRange; j++)
{ {
if (this.canDrainReagent(ritualStone, ReagentRegistry.aquasalusReagent, aquasalusDrain, false)) for (int k = -hydrationRange; k <= hydrationRange; k++)
{ {
if (SpellHelper.hydrateSoil(world, x + i, y + 1, z + j))
if (this.canDrainReagent(ritualStone, ReagentRegistry.aquasalusReagent, aquasalusDrain, false))
{ {
this.canDrainReagent(ritualStone, ReagentRegistry.aquasalusReagent, aquasalusDrain, true); if (SpellHelper.hydrateSoil(world, x + i, y + k, z + j))
{
this.canDrainReagent(ritualStone, ReagentRegistry.aquasalusReagent, aquasalusDrain, true);
}
} }
} }
} }
@ -73,14 +77,19 @@ public class RitualEffectGrowth extends RitualEffect
{ {
for (int j = -range; j <= range; j++) for (int j = -range; j <= range; j++)
{ {
Block block = world.getBlock(x + i, y + 2, z + j);
for (int k = -range; k <= range; k++)
if (block instanceof IPlantable || block instanceof IGrowable)
{ {
Block block = world.getBlock(x + i, y + k, z + j);
if (block instanceof IPlantable || block instanceof IGrowable)
{ {
SpellHelper.sendIndexedParticleToAllAround(world, x, y, z, 20, world.provider.dimensionId, 3, x, y, z); {
block.updateTick(world, x + i, y + 2, z + j, world.rand); SpellHelper.sendIndexedParticleToAllAround(world, x, y, z, 20, world.provider.dimensionId, 3, x, y, z);
flag++; block.updateTick(world, x + i, y + k, z + j, world.rand);
flag++;
}
} }
} }
} }