mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-10 04:40:10 +07:00
Code Issues Packages Projects Releases Wiki Activity

Minor bugfixes

Browse Source
This commit is contained in:
Anuken 2021-06-09 08:37:26 -04:00
parent 1895c7b8e0
commit 7dcfd648f7
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,22 +131,24 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
@Remote(called = Loc.both, targets = Loc.both, forward = true, unreliable = true)
public static void deletePlans(Player player, int[] positions){
if(netServer.admins.allowAction(player, ActionType.removePlanned, a -> a.plans = positions)){
if(net.server() && !netServer.admins.allowAction(player, ActionType.removePlanned, a -> a.plans = positions)){
throw new ValidateException(player, "Player cannot remove plans.");
}
var it = player.team().data().blocks.iterator();
//O(n^2) search here; no way around it
outer:
while(it.hasNext()){
BlockPlan req = it.next();
if(player == null) return;
for(int pos : positions){
if(req.x == Point2.x(pos) && req.y == Point2.y(pos)){
it.remove();
continue outer;
}
var it = player.team().data().blocks.iterator();
//O(n^2) search here; no way around it
outer:
while(it.hasNext()){
BlockPlan req = it.next();
for(int pos : positions){
if(req.x == Point2.x(pos) && req.y == Point2.y(pos)){
it.remove();
continue outer;
}
}
}
}

5
core/src/mindustry/world/blocks/experimental/BlockUnloader.java
View File

@ -16,6 +16,11 @@ public class BlockUnloader extends BlockLoader{
return true;
}
@Override
public boolean rotatedOutput(int x, int y){
return false;
}
public class BlockUnloaderBuild extends BlockLoaderBuild{
@Override