From 4e946ae52b344e6dc015307dabf6f4fa28d6ab7e Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 26 Oct 2019 21:20:05 -0400 Subject: [PATCH] Fixed #903 / Fixed #902 --- core/src/io/anuke/mindustry/core/NetServer.java | 2 ++ core/src/io/anuke/mindustry/input/MobileInput.java | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/src/io/anuke/mindustry/core/NetServer.java b/core/src/io/anuke/mindustry/core/NetServer.java index cadab029a7..437cb10d57 100644 --- a/core/src/io/anuke/mindustry/core/NetServer.java +++ b/core/src/io/anuke/mindustry/core/NetServer.java @@ -331,6 +331,8 @@ public class NetServer implements ApplicationListener{ player.sendMessage("[scarlet]Did you really expect to be able to kick an admin?"); }else if(found.isLocal){ player.sendMessage("[scarlet]Local players cannot be kicked."); + }else if(found.getTeam() != player.getTeam()){ + player.sendMessage("[scarlet]Only players on your team can be kicked."); }else{ if(!vtime.get()){ player.sendMessage("[scarlet]You must wait " + voteTime/60 + " minutes between votekicks."); diff --git a/core/src/io/anuke/mindustry/input/MobileInput.java b/core/src/io/anuke/mindustry/input/MobileInput.java index 692a5f505c..b5461fc88f 100644 --- a/core/src/io/anuke/mindustry/input/MobileInput.java +++ b/core/src/io/anuke/mindustry/input/MobileInput.java @@ -153,7 +153,9 @@ public class MobileInput extends InputHandler implements GestureListener{ void removeRequest(BuildRequest request){ selectRequests.removeValue(request, true); - removals.add(request); + if(!request.breaking){ + removals.add(request); + } } boolean isLinePlacing(){