[DEV] Backport Fixes from DEV branch
- BUG - Server being pinged constantly during direct connect or lan - BUG - Single Player Nojang Server not returning null in multiplayer - FEAT - Way to check if login/logout event was sent from vanish
This commit is contained in:
@@ -72,6 +72,9 @@ public class BridgedMinecraft {
|
||||
|
||||
@Nullable
|
||||
public BridgedIntegratedServer getSinglePlayerServer() {
|
||||
if (internal.getSingleplayerServer() == null)
|
||||
return null;
|
||||
|
||||
return BridgedIntegratedServer.of(internal.getSingleplayerServer());
|
||||
}
|
||||
|
||||
|
@@ -4,7 +4,6 @@ import com.hypherionmc.craterlib.utils.ChatUtils;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.minecraft.client.multiplayer.ServerData;
|
||||
import net.minecraft.client.multiplayer.ServerStatusPinger;
|
||||
|
||||
@RequiredArgsConstructor(staticName = "of")
|
||||
public class BridgedServerData {
|
||||
@@ -25,12 +24,10 @@ public class BridgedServerData {
|
||||
|
||||
public int getMaxPlayers() {
|
||||
if (!internal.pinged || internal.players == null) {
|
||||
try {
|
||||
new ServerStatusPinger().pingServer(internal, () -> {});
|
||||
} catch (Exception ignored) {}
|
||||
return internal.playerList.size() + 1;
|
||||
}
|
||||
|
||||
return internal.players == null ? 0 : internal.players.max();
|
||||
return internal.players.max();
|
||||
}
|
||||
|
||||
public ServerData toMojang() {
|
||||
|
Reference in New Issue
Block a user