From 8625ef09ccad287758bac212c5b4de67fd263378 Mon Sep 17 00:00:00 2001 From: summetdev Date: Sun, 18 Oct 2020 19:54:10 +0300 Subject: [PATCH 1/4] Units payload --- core/src/mindustry/input/InputHandler.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java index 6608b4613b..d8ce3e38c1 100644 --- a/core/src/mindustry/input/InputHandler.java +++ b/core/src/mindustry/input/InputHandler.java @@ -241,6 +241,11 @@ public abstract class InputHandler implements InputProcessor, GestureListener{ pay.set(x, y); pay.dropLastPayload(); pay.set(prevx, prevy); + pay.controlling().each(u -> { + if (u instanceof Payloadc p){ + p.dropLastPayload(); + } + }); } } From 2e0c1cd613ae8d2629e55e10d9771c815b12df05 Mon Sep 17 00:00:00 2001 From: Summet Date: Sun, 18 Oct 2020 20:07:46 +0300 Subject: [PATCH 2/4] code style Co-authored-by: Anuken --- core/src/mindustry/input/InputHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java index d8ce3e38c1..1a2e587d02 100644 --- a/core/src/mindustry/input/InputHandler.java +++ b/core/src/mindustry/input/InputHandler.java @@ -242,7 +242,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{ pay.dropLastPayload(); pay.set(prevx, prevy); pay.controlling().each(u -> { - if (u instanceof Payloadc p){ + if(u instanceof Payloadc p){ p.dropLastPayload(); } }); From 12e35b643caeb1d19ffd306a884921da93fcc08a Mon Sep 17 00:00:00 2001 From: summetdev Date: Sun, 18 Oct 2020 20:24:09 +0300 Subject: [PATCH 3/4] sync fix --- core/src/mindustry/input/InputHandler.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java index d8ce3e38c1..515aed1baa 100644 --- a/core/src/mindustry/input/InputHandler.java +++ b/core/src/mindustry/input/InputHandler.java @@ -241,11 +241,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{ pay.set(x, y); pay.dropLastPayload(); pay.set(prevx, prevy); - pay.controlling().each(u -> { - if (u instanceof Payloadc p){ - p.dropLastPayload(); - } - }); + pay.controlling().each(u -> Call.payloadDropped(u, u.x, u.y)); } } From 801eca5ca3b2ada72884880636c9344d6ea999ea Mon Sep 17 00:00:00 2001 From: summetdev Date: Sun, 18 Oct 2020 21:26:32 +0300 Subject: [PATCH 4/4] prevent sending extra packets --- core/src/mindustry/input/InputHandler.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java index 515aed1baa..4c425fb2f4 100644 --- a/core/src/mindustry/input/InputHandler.java +++ b/core/src/mindustry/input/InputHandler.java @@ -241,7 +241,11 @@ public abstract class InputHandler implements InputProcessor, GestureListener{ pay.set(x, y); pay.dropLastPayload(); pay.set(prevx, prevy); - pay.controlling().each(u -> Call.payloadDropped(u, u.x, u.y)); + pay.controlling().each(u -> { + if(u instanceof Payloadc){ + Call.payloadDropped(u, u.x, u.y); + } + }); } }