diff --git a/src/main/java/com/minelittlepony/unicopia/entity/ButterflyEntity.java b/src/main/java/com/minelittlepony/unicopia/entity/ButterflyEntity.java index e17d2aa7..deb7f9ba 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/ButterflyEntity.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/ButterflyEntity.java @@ -76,7 +76,7 @@ public class ButterflyEntity extends AmbientEntity { @Override protected Entity.MoveEffect getMoveEffect() { - return Entity.MoveEffect.EVENTS; + return Entity.MoveEffect.NONE; } @Override @@ -102,11 +102,6 @@ public class ButterflyEntity extends AmbientEntity { return false; } - @Override - public boolean isCollidable() { - return true; - } - @Override protected void pushAway(Entity entity) { } diff --git a/src/main/java/com/minelittlepony/unicopia/entity/FloatingArtefactEntity.java b/src/main/java/com/minelittlepony/unicopia/entity/FloatingArtefactEntity.java index f0fec37d..9533a1c4 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/FloatingArtefactEntity.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/FloatingArtefactEntity.java @@ -180,8 +180,8 @@ public class FloatingArtefactEntity extends Entity { } @Override - public boolean isCollidable() { - return true; + public boolean canHit() { + return false; } @Override