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-03-27 22:12:54 -04:00
parent d11a26c568 cf3543ec07
commit e81219dd3e
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -223,7 +223,7 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
con.kick(reason); con.kick(reason);
} }
void kick(String reason, int duration){ void kick(String reason, long duration){
con.kick(reason, duration); con.kick(reason, duration);
} }

2
core/src/mindustry/net/NetConnection.java
View File

@@ -62,7 +62,7 @@ public abstract class NetConnection{
} }
/** Kick with an arbitrary reason, and a kick duration in milliseconds. */ /** Kick with an arbitrary reason, and a kick duration in milliseconds. */
public void kick(String reason, int kickDuration){ public void kick(String reason, long kickDuration){
if(kicked) return; if(kicked) return;
Log.info("Kicking connection @; Reason: @", address, reason.replace("\n", " ")); Log.info("Kicking connection @; Reason: @", address, reason.replace("\n", " "));

8
servers_v6.json
View File

@@ -3,6 +3,10 @@
"name": "RCR", "name": "RCR",
"address": ["rcr.fvds.ru"] "address": ["rcr.fvds.ru"]
}, },
{
"name": "SMokeOfAnarchy.duckdns.org",
"address": ["smokeofanarchy.duckdns.org:6853"]
},
{ {
"name": "mindustry.pl", "name": "mindustry.pl",
"address": ["mindustry.pl:6000", "mindustry.pl:6666", "mindustry.pl"] "address": ["mindustry.pl:6000", "mindustry.pl:6666", "mindustry.pl"]
@@ -25,7 +29,7 @@
}, },
{ {
"name": "io", "name": "io",
"address": ["mindustry.io", "mindustry.io:1000", "mindustry.io:2000", "mindustry.io:3000", "mindustry.io:4000"] "address": ["mindustry.io.community", "mindustry.io.community:1000", "mindustry.io.community:2000", "mindustry.io.community:3000", "mindustry.io.community:4000"]
}, },
{ {
"name": "ECAN", "name": "ECAN",
@@ -85,7 +89,7 @@
}, },
{ {
"name": "MD Community", "name": "MD Community",
"address": ["212.109.196.158:9999", "157.90.183.56:28424"] "address": ["62.109.31.34", "157.90.183.56:28424"]
}, },
{ {
"name": "Mindustry.Party", "name": "Mindustry.Party",