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

Fixed #8632

Browse Source
This commit is contained in:
Anuken
2023-05-24 09:49:30 -04:00
parent 3813d66f30
commit 19cd6fd07c
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/assets/bundles/bundle.properties
View File

@ -1811,8 +1811,8 @@ hint.factoryControl.mobile = To set a unit factory's [accent]output destination[
gz.mine = Move near the \uF8C4 [accent]copper ore[] on the ground and click to begin mining.
gz.mine.mobile = Move near the \uF8C4 [accent]copper ore[] on the ground and tap it to begin mining.
gz.research = Open the \uE875 tech tree.\nResearch the \uF870 [accent]Mechanical Drill[], then select it from the menu in the bottom right.\nClick on a copper patch to place it.
gz.research.mobile = Open the \uE875 tech tree.\nResearch the \uF870 [accent]Mechanical Drill[], then select it from the menu in the bottom right.\nTap on a copper patch to place it.\n\nPress the \uE800 [accent]checkmark[] at the bottom right to confirm.
gz.research = Open the \uE875 tech tree.\nResearch the \uF870 [accent]Mechanical Drill[], then select it from the \ue85e menu in the bottom right.\nClick on a copper patch to place it.
gz.research.mobile = Open the \uE875 tech tree.\nResearch the \uF870 [accent]Mechanical Drill[], then select it from the \ue85e menu in the bottom right.\nTap on a copper patch to place it.\n\nPress the \uE800 [accent]checkmark[] at the bottom right to confirm.
gz.conveyors = Research and place \uF896 [accent]conveyors[] to move the mined resources\nfrom drills to the core.\n\nClick and drag to place multiple conveyors.\n[accent]Scroll[] to rotate.
gz.conveyors.mobile = Research and place \uF896 [accent]conveyors[] to move the mined resources\nfrom drills to the core.\n\nHold down your finger for a second and drag to place multiple conveyors.
gz.drills = Expand the mining operation.\nPlace more Mechanical Drills.\nMine 100 copper.

3
core/src/mindustry/net/ArcNetProvider.java
View File

@ -136,8 +136,7 @@ public class ArcNetProvider implements NetProvider{
@Override
public void received(Connection connection, Object object){
if(!(connection.getArbitraryData() instanceof ArcConnection k)) return;
if(!(object instanceof Packet pack)) return;
if(!(connection.getArbitraryData() instanceof ArcConnection k) || !(object instanceof Packet pack)) return;
if(packetSpamLimit > 0 && !k.packetRate.allow(3000, packetSpamLimit)){
Log.warn("Blacklisting IP '@' as potential DOS attack - packet spam.", k.address);

8
tools/src/mindustry/tools/Generators.java
View File

@ -349,7 +349,13 @@ public class Generators{
region.path.delete();
save(out, region.name);
//1 pixel of padding to prevent edges with linear filtering
int padding = 1;
Pixmap padded = new Pixmap(base.width + padding*2, base.height + padding*2);
padded.draw(base, padding, padding);
padded = padded.outline(block.outlineColor, block.outlineRadius);
save(padded, region.name);
}
if(!regions[0].found()){