From 757e0fbda0f675ca68255655b5ea601a5026a825 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 14 Sep 2020 16:56:32 -0400 Subject: [PATCH] Cleanup --- core/src/mindustry/entities/comp/HitboxComp.java | 4 ++-- .../mindustry/world/blocks/distribution/PayloadRouter.java | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/entities/comp/HitboxComp.java b/core/src/mindustry/entities/comp/HitboxComp.java index f92948af41..a1da7671df 100644 --- a/core/src/mindustry/entities/comp/HitboxComp.java +++ b/core/src/mindustry/entities/comp/HitboxComp.java @@ -61,7 +61,7 @@ abstract class HitboxComp implements Posc, QuadTreeObject{ } public void hitboxTile(Rect rect){ - float scale = 0.66f; - rect.setCentered(x, y, hitSize * scale, hitSize * scale); + float size = hitSize * 0.66f; + rect.setCentered(x, y, size, size); } } diff --git a/core/src/mindustry/world/blocks/distribution/PayloadRouter.java b/core/src/mindustry/world/blocks/distribution/PayloadRouter.java index e18d1cc62d..3f277c82d3 100644 --- a/core/src/mindustry/world/blocks/distribution/PayloadRouter.java +++ b/core/src/mindustry/world/blocks/distribution/PayloadRouter.java @@ -41,6 +41,8 @@ public class PayloadRouter extends PayloadConveyor{ do{ rotation = (rotation + 1) % 4; onProximityUpdate(); + //this condition intentionally uses "accept from itself" conditions, because payload conveyors only accept during the start + //"accept from self" conditions are for dropped payloads and are less restrictive }while((blocked || next == null || !next.acceptPayload(next, item)) && ++rotations < 4); } }