Bugfixes

2020-09-09 23:39:00 -04:00
parent 2260e6824c
commit 3b5d6860d6
56 changed files with 554 additions and 544 deletions
@@ -193,20 +193,25 @@ public class PayloadConveyor extends Block{

        @Override
        public boolean acceptPayload(Building source, Payload payload){
+            if(source == this){
+                return this.item == null && payload.fits();
+            }
            //accepting payloads from units isn't supported
-            return this.item == null && progress <= 5f && source != this && payload.fits();
+            return this.item == null && progress <= 5f && payload.fits();
        }

        @Override
        public void handlePayload(Building source, Payload payload){
            this.item = payload;
            this.stepAccepted = curStep();
-            this.itemRotation = source.angleTo(this);
+            this.itemRotation = source == this ? rotdeg() : source.angleTo(this);
            this.animation = 0;

            updatePayload();
        }

+
+
        @Override
        public void write(Writes write){
            super.write(write);