diff --git a/core/src/mindustry/entities/type/Unit.java b/core/src/mindustry/entities/type/Unit.java index ab02f24c83..6a037d6f36 100644 --- a/core/src/mindustry/entities/type/Unit.java +++ b/core/src/mindustry/entities/type/Unit.java @@ -226,7 +226,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ float radScl = 1.5f; for(Unit en : arr){ - if(en.isFlying() != isFlying() || (en instanceof Player && en.getTeam() != getTeam())) continue; + if(en.isFlying() != isFlying() || (en instanceof Player && en.getTeam() != getTeam()) || (this instanceof Player && en.isFlying())) continue; float dst = dst(en); float scl = Mathf.clamp(1f - dst / (getSize()/(radScl*2f) + en.getSize()/(radScl*2f))); moveVector.add(Tmp.v1.set((x - en.x) * scl, (y - en.y) * scl).limit(0.4f)); diff --git a/core/src/mindustry/world/blocks/production/GenericCrafter.java b/core/src/mindustry/world/blocks/production/GenericCrafter.java index 7261effb4c..ee0e9a3c30 100644 --- a/core/src/mindustry/world/blocks/production/GenericCrafter.java +++ b/core/src/mindustry/world/blocks/production/GenericCrafter.java @@ -149,14 +149,6 @@ public class GenericCrafter extends Block{ return itemCapacity; } - public Item outputItem(){ - return outputItem == null ? null : outputItem.item; - } - - public Liquid outputLiquid(){ - return outputLiquid == null ? null : outputLiquid.liquid; - } - public static class GenericCrafterEntity extends TileEntity{ public float progress; public float totalProgress; diff --git a/gradle.properties b/gradle.properties index 40485198b7..aa36264bb8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=4882a25c74ada2c0aff9dbcf2cef0ab1b7936b67 +archash=7bfc46fe8c7810fbef1b6f6bbb19c8b999856813