From 0e055d106d479da4493a38d1f2e4f02fb19ebb45 Mon Sep 17 00:00:00 2001 From: Tim203 Date: Thu, 3 Mar 2022 00:31:44 +0100 Subject: [PATCH] Bumped Adventure. Only set empty texture when needed --- build-logic/src/main/kotlin/Versions.kt | 22 +++++++++---------- .../floodgate/listener/BungeeListener.java | 11 ++++++---- .../listener/PaperProfileListener.java | 15 ++++++++++--- .../listener/SpigotListenerRegistration.java | 4 ---- .../floodgate/listener/VelocityListener.java | 12 +++++++--- 5 files changed, 39 insertions(+), 25 deletions(-) diff --git a/build-logic/src/main/kotlin/Versions.kt b/build-logic/src/main/kotlin/Versions.kt index 4ce4c6f4..21131e6a 100644 --- a/build-logic/src/main/kotlin/Versions.kt +++ b/build-logic/src/main/kotlin/Versions.kt @@ -24,17 +24,17 @@ */ object Versions { - const val geyserVersion= "2.0.0-SNAPSHOT" - const val cumulusVersion= "1.0-SNAPSHOT" - const val spigotVersion= "1.13-R0.1-SNAPSHOT" - const val fastutilVersion= "8.5.3" - const val lombokVersion= "1.18.20" - const val guiceVersion= "5.0.1" - const val nettyVersion= "4.1.49.Final" - const val snakeyamlVersion= "1.28" - const val cloudVersion= "1.5.0" - const val adventureApiVersion= "4.9.1" - const val adventurePlatformVersion= "4.0.0" + const val geyserVersion = "2.0.0-SNAPSHOT" + const val cumulusVersion = "1.0-SNAPSHOT" + const val spigotVersion = "1.13-R0.1-SNAPSHOT" + const val fastutilVersion = "8.5.3" + const val lombokVersion = "1.18.20" + const val guiceVersion = "5.0.1" + const val nettyVersion = "4.1.49.Final" + const val snakeyamlVersion = "1.28" + const val cloudVersion = "1.5.0" + const val adventureApiVersion = "4.10.0" + const val adventurePlatformVersion = "4.0.1" const val javaWebsocketVersion = "1.5.2" diff --git a/bungee/src/main/java/org/geysermc/floodgate/listener/BungeeListener.java b/bungee/src/main/java/org/geysermc/floodgate/listener/BungeeListener.java index 9b3eea51..f86a2a32 100644 --- a/bungee/src/main/java/org/geysermc/floodgate/listener/BungeeListener.java +++ b/bungee/src/main/java/org/geysermc/floodgate/listener/BungeeListener.java @@ -46,7 +46,7 @@ import net.md_5.bungee.netty.ChannelWrapper; import org.geysermc.floodgate.api.ProxyFloodgateApi; import org.geysermc.floodgate.api.logger.FloodgateLogger; import org.geysermc.floodgate.api.player.FloodgatePlayer; -import org.geysermc.floodgate.player.FloodgatePlayerImpl; +import org.geysermc.floodgate.config.ProxyFloodgateConfig; import org.geysermc.floodgate.skin.SkinApplier; import org.geysermc.floodgate.skin.SkinData; import org.geysermc.floodgate.util.BungeeCommandUtil; @@ -67,6 +67,7 @@ public final class BungeeListener implements Listener { checkNotNull(PLAYER_NAME, "Initial name field cannot be null"); } + @Inject private ProxyFloodgateConfig config; @Inject private ProxyFloodgateApi api; @Inject private LanguageManager languageManager; @Inject private FloodgateLogger logger; @@ -128,9 +129,11 @@ public final class BungeeListener implements Listener { @EventHandler(priority = EventPriority.LOWEST) public void onPostLogin(PostLoginEvent event) { // To fix the February 2 2022 Mojang authentication changes - FloodgatePlayer player = api.getPlayer(event.getPlayer().getUniqueId()); - if (player != null) { - skinApplier.applySkin(player, new SkinData("", "")); + if (!config.isSendFloodgateData()) { + FloodgatePlayer player = api.getPlayer(event.getPlayer().getUniqueId()); + if (player != null && !player.isLinked()) { + skinApplier.applySkin(player, new SkinData("", "")); + } } } diff --git a/spigot/src/main/java/org/geysermc/floodgate/listener/PaperProfileListener.java b/spigot/src/main/java/org/geysermc/floodgate/listener/PaperProfileListener.java index a03c7221..5672ead8 100644 --- a/spigot/src/main/java/org/geysermc/floodgate/listener/PaperProfileListener.java +++ b/spigot/src/main/java/org/geysermc/floodgate/listener/PaperProfileListener.java @@ -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; } diff --git a/spigot/src/main/java/org/geysermc/floodgate/listener/SpigotListenerRegistration.java b/spigot/src/main/java/org/geysermc/floodgate/listener/SpigotListenerRegistration.java index acc26c4f..d3052286 100644 --- a/spigot/src/main/java/org/geysermc/floodgate/listener/SpigotListenerRegistration.java +++ b/spigot/src/main/java/org/geysermc/floodgate/listener/SpigotListenerRegistration.java @@ -38,10 +38,6 @@ public final class SpigotListenerRegistration implements ListenerRegistration