1
0
mirror of https://github.com/GeyserMC/Floodgate.git synced 2025-12-19 14:59:20 +00:00

Bumped Adventure. Only set empty texture when needed

This commit is contained in:
Tim203
2022-03-03 00:31:44 +01:00
parent b447fcbbff
commit 0e055d106d
5 changed files with 39 additions and 25 deletions

View File

@@ -34,6 +34,7 @@ import java.util.UUID;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.geysermc.floodgate.api.SimpleFloodgateApi;
import org.geysermc.floodgate.api.player.FloodgatePlayer;
public final class PaperProfileListener implements Listener {
@Inject private SimpleFloodgateApi api;
@@ -41,11 +42,19 @@ public final class PaperProfileListener implements Listener {
@EventHandler
public void onFill(PreFillProfileEvent event) {
UUID id = event.getPlayerProfile().getId();
if (id == null) {
return;
}
FloodgatePlayer player = api.getPlayer(id);
if (player == null || player.isLinked()) {
return;
}
// back when this event got added the PlayerProfile class didn't have the
// hasProperty / hasTextures methods
if (id == null || !this.api.isFloodgatePlayer(id) ||
event.getPlayerProfile().getProperties().stream().anyMatch(
prop -> "textures".equals(prop.getName()))) {
if (event.getPlayerProfile().getProperties().stream().anyMatch(
prop -> "textures".equals(prop.getName()))) {
return;
}

View File

@@ -38,10 +38,6 @@ public final class SpigotListenerRegistration implements ListenerRegistration<Li
@Override
public void register(Listener listener) {
if (listener == null) {
return;
}
Bukkit.getServer().getPluginManager().registerEvents(listener, plugin);
}
}