Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Bukkit/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,14 @@ repositories {
maven("https://ci.frostcast.net/plugin/repository/everything/")
maven("https://jitpack.io/")
maven("https://repo.extendedclip.com/content/repositories/placeholderapi/");
maven {
url = uri("https://repo.dmulloy2.net/repository/public/")
}
}

dependencies {
compileOnly("com.destroystokyo.paper:paper-api:1.16.5-R0.1-SNAPSHOT")
compileOnly("com.comphenix.protocol:ProtocolLib:5.0.0") { isTransitive = false }
compileOnly("com.comphenix.protocol:ProtocolLib:5.3.0") { isTransitive = false }

compileOnly("me.confuser.banmanager:BanManagerCommon:7.6.0") { isTransitive = false }
compileOnly("com.github.seancfoley:ipaddress:5.3.3") /* For BanManager */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ public void onServerListPing(ServerListPingEvent event) {
protected abstract void setPlayerHover(PaperServerListPingEvent event, String playerHover);

private void handlePaperServerListPing(final PaperServerListPingEvent event) {
if (bukkit.getCore() == null) return; // Too early, we haven't finished initializing yet
if (bukkit.getCore() == null)
return; // Too early, we haven't finished initializing yet

StatusRequest request = bukkit.getCore().createRequest(event.getAddress());
request.setProtocolVersion(event.getClient().getProtocolVersion());
Expand All @@ -80,43 +81,51 @@ public Integer getMaxPlayers() {
public int getProtocolVersion() {
return event.getProtocolVersion();
}
}
);
});

// Description
String description = response.getDescription();
if (description != null) event.setMotd(description);
if (description != null)
event.setMotd(description);

// Version name
String version = response.getVersion();
if (version != null) event.setVersion(version);
if (version != null)
event.setVersion(version);
// Protocol version
Integer protocol = response.getProtocolVersion();
if (protocol != null) event.setProtocolVersion(protocol);
if (protocol != null)
event.setProtocolVersion(protocol);

if (response.hidePlayers()) {
event.setHidePlayers(true);
} else {
// Online players
Integer onlinePlayers = response.getOnlinePlayers();
if (onlinePlayers != null) event.setNumPlayers(onlinePlayers);
if (onlinePlayers != null)
event.setNumPlayers(onlinePlayers);
// Max players
Integer maxPlayers = response.getMaxPlayers();
if (maxPlayers != null) event.setMaxPlayers(maxPlayers);
if (maxPlayers != null)
event.setMaxPlayers(maxPlayers);

// Player hover
String playerHover = response.getPlayerHover();
if (playerHover != null) setPlayerHover(event, playerHover);
if (playerHover != null)
setPlayerHover(event, playerHover);
}

// Favicon
FaviconSource favicon = response.getFavicon();
if (favicon == FaviconSource.NONE) {
event.setServerIcon(null);
} else if (favicon != null) {
CachedServerIcon icon = bukkit.getFavicon(favicon);
if (icon != null)
event.setServerIcon(icon);
try {
FaviconSource favicon = response.getFavicon();
if (favicon == FaviconSource.NONE) {
event.setServerIcon(null);
} else if (favicon != null) {
CachedServerIcon icon = bukkit.getFavicon(favicon);
if (icon != null)
event.setServerIcon(icon);
}
} catch (Exception ignore) {
}
}

Expand Down
2 changes: 1 addition & 1 deletion Bungee/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ repositories {
}

dependencies {
compileOnly("net.md-5:bungeecord-api:1.21-R0.1-SNAPSHOT")
compileOnly("net.md-5:bungeecord-api:1.16-R0.3")

compileOnly("com.github.lucavinci:bungeeban:v2.7.0") { isTransitive = false }
}
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ allprojects {
plugins.apply("java")

java {
sourceCompatibility = JavaVersion.VERSION_1_7
sourceCompatibility = JavaVersion.VERSION_1_8
}

repositories {
Expand Down
Loading