Fixed discarded shells appearing in water

This commit is contained in:
Anuken
2018-05-03 15:19:00 -04:00
parent 2af750cfec
commit 3a3c23d2f1
2 changed files with 16 additions and 9 deletions
@@ -1,5 +1,7 @@
package io.anuke.mindustry.entities.effect;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.world.Tile;
import io.anuke.ucore.core.Effects;
import io.anuke.ucore.core.Effects.Effect;
import io.anuke.ucore.core.Timers;
@@ -22,6 +24,10 @@ public class GroundEffectEntity extends EffectEntity {
if (!once && time >= lifetime) {
once = true;
time = 0f;
Tile tile = Vars.world.tileWorld(x, y);
if(tile != null && tile.floor().liquid){
remove();
}
} else if (once && time >= effect.staticLife) {
remove();
}
@@ -36,10 +42,16 @@ public class GroundEffectEntity extends EffectEntity {
if(once && effect.isStatic)
Effects.renderEffect(id, effect, color, lifetime, rotation, x, y, data);
else if(!effect.isStatic)
else
Effects.renderEffect(id, effect, color, time, rotation, x, y, data);
}
@Override
public void reset() {
super.reset();
once = false;
}
public static class GroundEffect extends Effect{
public final float staticLife;
public final boolean isStatic;