mirror of
https://github.com/VolmitSoftware/Iris.git
synced 2025-12-30 12:29:20 +00:00
Fixes
This commit is contained in:
@@ -118,11 +118,6 @@ public class IrisEntity extends IrisRegistrant
|
||||
@Desc("Loot tables for drops")
|
||||
private IrisLootReference loot = new IrisLootReference();
|
||||
|
||||
@DontObfuscate
|
||||
@Desc("Potion effects to add to this entity")
|
||||
@ArrayType(min = 1, type = IrisPotionEffect.class)
|
||||
private KList<IrisPotionEffect> potionEffects = new KList<>();
|
||||
|
||||
@DontObfuscate
|
||||
@Desc("If specified, this entity will be leashed by this entity. I.e. THIS ENTITY Leashed by SPECIFIED. This has no effect on EnderDragons, Withers, Players, or Bats.Non-living entities excluding leashes will not persist as leashholders.")
|
||||
private IrisEntity leashHolder = null;
|
||||
@@ -218,11 +213,6 @@ public class IrisEntity extends IrisRegistrant
|
||||
|
||||
l.setRemoveWhenFarAway(isRemovable());
|
||||
|
||||
for(IrisPotionEffect i : getPotionEffects())
|
||||
{
|
||||
i.apply(l);
|
||||
}
|
||||
|
||||
if(getHelmet() != null && rng.i(1, getHelmet().getRarity()) == 1)
|
||||
{
|
||||
l.getEquipment().setHelmet(getHelmet().get(gen.isDev(), rng));
|
||||
|
||||
@@ -404,7 +404,7 @@ public class IrisObject extends IrisRegistrant
|
||||
listener.accept(new BlockPosition(xx, yy, zz));
|
||||
}
|
||||
|
||||
if(!data.getMaterial().equals(Material.AIR))
|
||||
if(!data.getMaterial().equals(Material.AIR) && !data.getMaterial().equals(Material.CAVE_AIR))
|
||||
{
|
||||
placer.set(xx, yy, zz, data);
|
||||
}
|
||||
@@ -447,7 +447,7 @@ public class IrisObject extends IrisRegistrant
|
||||
{
|
||||
for(int j = yf; j > yg - config.getOverStilt(); j--)
|
||||
{
|
||||
if(!d.getMaterial().equals(Material.AIR))
|
||||
if(!d.getMaterial().equals(Material.AIR) && !d.getMaterial().equals(Material.CAVE_AIR))
|
||||
{
|
||||
placer.set(xf, j, zf, d);
|
||||
}
|
||||
|
||||
@@ -14,6 +14,7 @@ import com.volmit.iris.util.Required;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@DontObfuscate
|
||||
@Desc("An iris potion effect")
|
||||
@Data
|
||||
public class IrisPotionEffect
|
||||
|
||||
Reference in New Issue
Block a user