Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add thing (#7012)

Browse Source
This commit is contained in:
Ilya246
2022-06-14 04:49:13 +04:00
committed by GitHub
parent 1be8f11ec8
commit 58bfd0e46c
5 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/input/DesktopInput.java
View File

@@ -254,7 +254,7 @@ public class DesktopInput extends InputHandler{
//validate commanding units
selectedUnits.removeAll(u -> !u.isCommandable() || !u.isValid());
if(!scene.hasMouse() && !locked){
if(!scene.hasMouse() && !locked && state.rules.possessionAllowed){
if(Core.input.keyDown(Binding.control) && Core.input.keyTap(Binding.select)){
Unit on = selectedUnit();
var build = selectedControlBuild();

2
core/src/mindustry/input/InputHandler.java
View File

@@ -475,7 +475,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
if(player == null) return;
//make sure player is allowed to control the unit
if(net.server() && !netServer.admins.allowAction(player, ActionType.control, action -> action.unit = unit)){
if(net.server() && (!state.rules.possessionAllowed || !netServer.admins.allowAction(player, ActionType.control, action -> action.unit = unit))){
throw new ValidateException(player, "Player cannot control a unit.");
}

4
core/src/mindustry/input/MobileInput.java
View File

@@ -658,10 +658,10 @@ public class MobileInput extends InputHandler implements GestureListener{
payloadTarget = null;
//control a unit/block detected on first tap of double-tap
if(unitTapped != null){
if(unitTapped != null && state.rules.possessionAllowed){
Call.unitControl(player, unitTapped);
recentRespawnTimer = 1f;
}else if(buildingTapped != null){
}else if(buildingTapped != null && state.rules.possessionAllowed){
Call.buildingControlSelect(player, buildingTapped);
recentRespawnTimer = 1f;
}else if(!checkConfigTap() && !tryBeginMine(cursor)){