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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2021-06-06 19:33:22 -04:00
parent b0ab33f125 faa8c68c20
commit bfc059769f
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/mindustry/content/Weathers.java
View File

@@ -117,5 +117,4 @@ public class Weathers implements ContentList{
baseSpeed = 0.03f; baseSpeed = 0.03f;
}}; }};
} }
} }

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

@@ -108,7 +108,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
if(build == null || build.items == null) return; if(build == null || build.items == null) return;
build.items.set(item, amount); build.items.set(item, amount);
} }
@Remote(called = Loc.server, unreliable = true) @Remote(called = Loc.server, unreliable = true)
public static void clearItems(Building build){ public static void clearItems(Building build){
if(build == null || build.items == null) return; if(build == null || build.items == null) return;
@@ -938,9 +938,9 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
//check if tapped block is configurable //check if tapped block is configurable
if(build.block.configurable && build.interactable(player.team())){ if(build.block.configurable && build.interactable(player.team())){
consumed = true; consumed = true;
if(((!frag.config.isShown() && build.shouldShowConfigure(player)) //if the config fragment is hidden, show if((!frag.config.isShown() && build.shouldShowConfigure(player)) //if the config fragment is hidden, show
//alternatively, the current selected block can 'agree' to switch config tiles //alternatively, the current selected block can 'agree' to switch config tiles
|| (frag.config.isShown() && frag.config.getSelectedTile().onConfigureTileTapped(build)))){ || (frag.config.isShown() && frag.config.getSelectedTile().onConfigureTileTapped(build))){
Sounds.click.at(build); Sounds.click.at(build);
frag.config.showConfig(build); frag.config.showConfig(build);
} }

2
servers_be.json
View File

@@ -12,7 +12,7 @@
"address": "mindustry.pl:7777" "address": "mindustry.pl:7777"
}, },
{ {
"address": "46.17.104.254:9999" "address": "mindurka.tk:9999"
}, },
{ {
"address": "mindustrypvp.ml:6000" "address": "mindustrypvp.ml:6000"

2
servers_v6.json
View File

@@ -89,7 +89,7 @@
}, },
{ {
"name": "MD Community", "name": "MD Community",
"address": ["46.17.104.254", "46.17.104.254:4000"] "address": ["mindurka.tk", "mindurka.tk:4000"]
}, },
{ {
"name": "Mindustry.Party", "name": "Mindustry.Party",