Anuken/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2024-11-11 03:31:19 +03:00
Code Issues Projects Releases Wiki Activity

Fixed #903 / Fixed #902

Browse Source
This commit is contained in:
Anuken 2019-10-26 21:20:05 -04:00
parent 236ed74cae
commit 4e946ae52b
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/core/NetServer.java
View File

@ -331,6 +331,8 @@ public class NetServer implements ApplicationListener{
player.sendMessage("[scarlet]Did you really expect to be able to kick an admin?"); player.sendMessage("[scarlet]Did you really expect to be able to kick an admin?");
}else if(found.isLocal){ }else if(found.isLocal){
player.sendMessage("[scarlet]Local players cannot be kicked."); 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{ }else{
if(!vtime.get()){ if(!vtime.get()){
player.sendMessage("[scarlet]You must wait " + voteTime/60 + " minutes between votekicks."); player.sendMessage("[scarlet]You must wait " + voteTime/60 + " minutes between votekicks.");

2
core/src/io/anuke/mindustry/input/MobileInput.java
View File

@ -153,8 +153,10 @@ public class MobileInput extends InputHandler implements GestureListener{
void removeRequest(BuildRequest request){ void removeRequest(BuildRequest request){
selectRequests.removeValue(request, true); selectRequests.removeValue(request, true);
if(!request.breaking){
removals.add(request); removals.add(request);
} }
}
boolean isLinePlacing(){ boolean isLinePlacing(){
return mode == placing && lineMode && Mathf.dst(lineStartX * tilesize, lineStartY * tilesize, Core.input.mouseWorld().x, Core.input.mouseWorld().y) >= 3 * tilesize; return mode == placing && lineMode && Mathf.dst(lineStartX * tilesize, lineStartY * tilesize, Core.input.mouseWorld().x, Core.input.mouseWorld().y) >= 3 * tilesize;