tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Fixed Walkie Talkies

Browse source
This commit is contained in:
Aidan C. Brady 2014-06-04 02:38:39 +02:00
parent f0d3848f8a
commit bda4f8cfe5
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/mekanism/client/ClientConnectionHandler.java
View file

@ -1,6 +1,6 @@
package mekanism.client;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import mekanism.client.voice.VoiceClient;
import mekanism.common.Mekanism;
@ -19,21 +19,23 @@ public class ClientConnectionHandler
{
if(event.isLocal)
{
//If the client is connecting to its own corresponding integrated server.
try {
MekanismClient.voiceClient = new VoiceClient(InetAddress.getLocalHost().getHostAddress());
MekanismClient.voiceClient = new VoiceClient("127.0.0.1");
//Will probably not work when multiple integrateds are running on one computer
} catch(Exception e) {
Mekanism.logger.error("Unable to establish VoiceClient on local connection.");
e.printStackTrace();
}
}
else {
//If the client is connecting to a foreign integrated or dedicated server.
try {
MekanismClient.voiceClient = new VoiceClient(event.manager.getSocketAddress().toString());
MekanismClient.voiceClient = new VoiceClient(((InetSocketAddress)event.manager.getSocketAddress()).getHostString());
} catch(Exception e) {
Mekanism.logger.error("Unable to establish VoiceClient on remote connection.");
e.printStackTrace();
}
//TODO this is probably wrong
}
}
}

2
src/main/java/mekanism/common/voice/VoiceConnection.java
View file

@ -57,7 +57,7 @@ public class VoiceConnection extends Thread
EntityPlayerMP playerMP = (EntityPlayerMP)obj;
String playerIP = playerMP.getPlayerIP();
if(!server.isDedicatedServer() && playerIP.equals("127.0.0.1") && !Mekanism.voiceManager.foundLocal)
if(!server.isDedicatedServer() && playerIP.equals("local") && !Mekanism.voiceManager.foundLocal)
{
Mekanism.voiceManager.foundLocal = true;
username = playerMP.getCommandSenderName();