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

Fixed incorrect discord presence updating

Browse Source
This commit is contained in:
Anuken 2018-02-19 14:45:18 -05:00
parent edc124c90d
commit ffabdba119
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/assets/version.properties
View File

@ -1,5 +1,5 @@
#Autogenerated file. Do not modify. #Autogenerated file. Do not modify.
#Mon Feb 19 14:31:15 EST 2018 #Mon Feb 19 14:44:36 EST 2018
version=beta version=beta
androidBuildCode=245 androidBuildCode=245
name=Mindustry name=Mindustry

1
core/src/io/anuke/mindustry/core/NetClient.java
View File

@ -350,6 +350,7 @@ public class NetClient extends Module {
ui.join.hide(); ui.join.hide();
Net.setClientLoaded(true); Net.setClientLoaded(true);
Timers.runTask(1f, () -> Net.send(new ConnectConfirmPacket(), SendMode.tcp)); Timers.runTask(1f, () -> Net.send(new ConnectConfirmPacket(), SendMode.tcp));
Timers.runTask(40f, Platform.instance::updateRPC);
} }
public void beginConnecting(){ public void beginConnecting(){

2
core/src/io/anuke/mindustry/net/Net.java
View File

@ -68,8 +68,6 @@ public class Net{
clientProvider.connect(ip, port); clientProvider.connect(ip, port);
active = true; active = true;
server = false; server = false;
Timers.runTask(60f, Platform.instance::updateRPC);
}else{ }else{
throw new IOException("Already connected!"); throw new IOException("Already connected!");
} }

5
desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java
View File

@ -65,9 +65,10 @@ public class DesktopPlatform extends Platform {
presence.state = Strings.capitalize(state.mode.name()) + ", Solo"; presence.state = Strings.capitalize(state.mode.name()) + ", Solo";
presence.details = Strings.capitalize(world.getMap().name) + " | Wave " + state.wave; presence.details = Strings.capitalize(world.getMap().name) + " | Wave " + state.wave;
presence.largeImageText = "Wave " + state.wave; presence.largeImageText = "Wave " + state.wave;
if(Net.active() ){
if(Net.active()){
presence.partyMax = 16; presence.partyMax = 16;
presence.partySize = Net.getConnections().size; presence.partySize = playerGroup.size();
presence.state = Strings.capitalize(state.mode.name()); presence.state = Strings.capitalize(state.mode.name());
} }
}else{ }else{