dasha_uwu/PrismLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

NOISSUE Use Vanilla logic for resolving servers

Browse source
This commit is contained in:
Janrupf 2021-05-22 17:00:14 +02:00
parent 0ccd7223fd
commit d97f13b4aa
4 changed files with 20 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

26
api/logic/launch/steps/LookupServerAddress.cpp
View file

@ -16,11 +16,6 @@ void LookupServerAddress::setLookupAddress(const QString &lookupAddress)
m_dnsLookup->setName(QString("_minecraft._tcp.%1").arg(lookupAddress));
}
void LookupServerAddress::setPort(quint16 port)
{
m_port = port;
}
void LookupServerAddress::setOutputAddressPtr(MinecraftServerTargetPtr output)
{
m_output = std::move(output);
@ -50,7 +45,7 @@ void LookupServerAddress::on_dnsLookupFinished()
{
emit logLine(QString("Failed to resolve server address (this is NOT an error!) %1: %2\n")
.arg(m_dnsLookup->name(), m_dnsLookup->errorString()), MessageLevel::MultiMC);
resolve(m_lookupAddress, m_port); // Technically the task failed, however, we don't abort the launch
resolve(m_lookupAddress, 25565); // Technically the task failed, however, we don't abort the launch
// and leave it up to minecraft to fail (or maybe not) when connecting
return;
}
@ -61,28 +56,17 @@ void LookupServerAddress::on_dnsLookupFinished()
emit logLine(
QString("Failed to resolve server address %1: the DNS lookup succeeded, but no records were returned.\n")
.arg(m_dnsLookup->name()), MessageLevel::Warning);
resolve(m_lookupAddress, m_port); // Technically the task failed, however, we don't abort the launch
resolve(m_lookupAddress, 25565); // Technically the task failed, however, we don't abort the launch
// and leave it up to minecraft to fail (or maybe not) when connecting
return;
}
const auto &firstRecord = records.at(0);
if (firstRecord.port() != m_port && m_port != 0)
{
emit logLine(
QString("DNS record for %1 suggested %2 as server port, but user supplied %3. Using user override,"
" but the port may be wrong!\n").arg(m_dnsLookup->name(), QString::number(firstRecord.port()), QString::number(m_port)),
MessageLevel::Warning);
}
else if (m_port == 0)
{
m_port = firstRecord.port();
}
quint16 port = firstRecord.port();
emit logLine(QString("Resolved server address %1 to %2 with port %3\n").arg(
m_dnsLookup->name(), firstRecord.target(), QString::number(m_port)),MessageLevel::MultiMC);
resolve(firstRecord.target(), m_port);
m_dnsLookup->name(), firstRecord.target(), QString::number(port)),MessageLevel::MultiMC);
resolve(firstRecord.target(), port);
}
void LookupServerAddress::resolve(const QString &address, quint16 port)