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-07-23 19:40:08 -04:00
parent 17e68f7a93 53214f0ddc
commit 7727da40b4
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/pull_request_template.md vendored
View File

@@ -1,4 +1,4 @@
If your pull request is **not** translation-related, read the list of requirements below and check each box: If your pull request is **not** translation or serverlist-related, read the list of requirements below and check each box:
- [ ] I have read the [contribution guidelines](https://github.com/Anuken/Mindustry/blob/master/CONTRIBUTING.md). - [ ] I have read the [contribution guidelines](https://github.com/Anuken/Mindustry/blob/master/CONTRIBUTING.md).
- [ ] I have ensured that my code compiles, if applicable. - [ ] I have ensured that my code compiles, if applicable.

2
core/src/mindustry/entities/comp/BuilderComp.java
View File

@@ -179,7 +179,7 @@ abstract class BuilderComp implements Posc, Statusc, Teamc, Rotc{
//requests that you have at least *started* are considered //requests that you have at least *started* are considered
if(state.rules.infiniteResources || team.rules().infiniteResources || request.breaking || core == null || request.isRotation(team)) return false; if(state.rules.infiniteResources || team.rules().infiniteResources || request.breaking || core == null || request.isRotation(team)) return false;
return (request.stuck && !core.items.has(request.block.requirements)) || (Structs.contains(request.block.requirements, i -> !core.items.has(i.item) && Mathf.round(i.amount * state.rules.buildCostMultiplier) > 0) && !request.initialized); return (request.stuck && !core.items.has(request.block.requirements)) || (Structs.contains(request.block.requirements, i -> !core.items.has(i.item, Math.min(i.amount, 15)) && Mathf.round(i.amount * state.rules.buildCostMultiplier) > 0) && !request.initialized);
} }
void removeBuild(int x, int y, boolean breaking){ void removeBuild(int x, int y, boolean breaking){

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

@@ -1027,7 +1027,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
return !Core.scene.hasMouse() return !Core.scene.hasMouse()
&& tile.drop() != null && tile.drop() != null
&& player.unit().validMine(tile) && player.unit().validMine(tile)
&& !(tile.floor().playerUnmineable && tile.overlay().itemDrop == null) && !((!Core.settings.getBool("doubletapmine") && tile.floor().playerUnmineable) && tile.overlay().itemDrop == null)
&& player.unit().acceptsItem(tile.drop()) && player.unit().acceptsItem(tile.drop())
&& tile.block() == Blocks.air; && tile.block() == Blocks.air;
} }

2
core/src/mindustry/type/UnitType.java
View File

@@ -279,7 +279,7 @@ public class UnitType extends UnlockableContent{
if(mineTier >= 1){ if(mineTier >= 1){
stats.addPercent(Stat.mineSpeed, mineSpeed); stats.addPercent(Stat.mineSpeed, mineSpeed);
stats.add(Stat.mineTier, StatValues.blocks(b -> b instanceof Floor f && f.itemDrop != null && f.itemDrop.hardness <= mineTier && !f.playerUnmineable)); stats.add(Stat.mineTier, StatValues.blocks(b -> b instanceof Floor f && f.itemDrop != null && f.itemDrop.hardness <= mineTier && (!f.playerUnmineable || Core.settings.getBool("doubletapmine"))));
} }
if(buildSpeed > 0){ if(buildSpeed > 0){
stats.addPercent(Stat.buildSpeed, buildSpeed); stats.addPercent(Stat.buildSpeed, buildSpeed);

2
servers_v6.json
View File

@@ -93,7 +93,7 @@
}, },
{ {
"name": "Hungarian", "name": "Hungarian",
"address": ["magyarmindustry.tk"] "address": ["magyarmindustry.tk", "148.251.175.124:25601"]
}, },
{ {
"name": "Xpdustry", "name": "Xpdustry",