fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add timeout when crystal flower charm's effect activates to prevent infinite looping when mod plants don't behave, fixes #488

Browse Source
This commit is contained in:
Electroblob77
2020-12-20 23:29:05 +00:00
parent 32e92b4b04
commit 58f6d55b0d
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/spell/GrowthAura.java
+4 -1
View File
@@ -17,6 +17,8 @@ import java.util.List;
public class GrowthAura extends Spell { public class GrowthAura extends Spell {
private static final int FULL_GROWTH_TIMEOUT = 100;
public GrowthAura(){ public GrowthAura(){
super("growth_aura", SpellActions.POINT_DOWN, false); super("growth_aura", SpellActions.POINT_DOWN, false);
addProperties(EFFECT_RADIUS); addProperties(EFFECT_RADIUS);
@@ -49,7 +51,8 @@ public class GrowthAura extends Spell {
if(!world.isRemote){ if(!world.isRemote){
if(plant.canUseBonemeal(world, world.rand, pos, state)){ if(plant.canUseBonemeal(world, world.rand, pos, state)){
if(world.rand.nextFloat() < 0.35f && ItemArtefact.isArtefactActive(caster, WizardryItems.charm_growth)){ if(world.rand.nextFloat() < 0.35f && ItemArtefact.isArtefactActive(caster, WizardryItems.charm_growth)){
while(plant.canGrow(world, pos, state, false)){ int i = 0;
while(plant.canGrow(world, pos, state, false) && i++ < FULL_GROWTH_TIMEOUT){
plant.grow(world, world.rand, pos, state); plant.grow(world, world.rand, pos, state);
state = world.getBlockState(pos); // Update the state with the new one state = world.getBlockState(pos); // Update the state with the new one
plant = (IGrowable)state.getBlock(); // Update the block with the new one plant = (IGrowable)state.getBlock(); // Update the block with the new one