From 885fd169727155cc160834cfe1a52211214a8173 Mon Sep 17 00:00:00 2001 From: Tim203 Date: Mon, 23 Nov 2020 00:20:54 +0100 Subject: [PATCH] Forgot to update the Velocity classes, lol --- .../floodgate/listener/VelocityPluginMessageHandler.java | 6 +++++- .../geysermc/floodgate/module/VelocityPlatformModule.java | 5 +++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/velocity/src/main/java/org/geysermc/floodgate/listener/VelocityPluginMessageHandler.java b/velocity/src/main/java/org/geysermc/floodgate/listener/VelocityPluginMessageHandler.java index 5e0a9d9e..580022dd 100644 --- a/velocity/src/main/java/org/geysermc/floodgate/listener/VelocityPluginMessageHandler.java +++ b/velocity/src/main/java/org/geysermc/floodgate/listener/VelocityPluginMessageHandler.java @@ -42,6 +42,7 @@ import java.util.UUID; import net.kyori.adventure.text.Component; import org.geysermc.common.form.Form; import org.geysermc.floodgate.api.logger.FloodgateLogger; +import org.geysermc.floodgate.config.FloodgateConfigHolder; import org.geysermc.floodgate.platform.pluginmessage.PluginMessageHandler; import org.geysermc.floodgate.util.RawSkin; @@ -50,11 +51,14 @@ public class VelocityPluginMessageHandler extends PluginMessageHandler { private FloodgateLogger logger; private ChannelIdentifier formChannel; + public VelocityPluginMessageHandler(FloodgateConfigHolder configHolder) { + super(configHolder); + } + @Inject // called because this is a listener as well public void init(ProxyServer proxy, FloodgateLogger logger, @Named("formChannel") String formChannelName, @Named("skinChannel") String skinChannelName) { - super.proxy = true; this.proxy = proxy; this.logger = logger; diff --git a/velocity/src/main/java/org/geysermc/floodgate/module/VelocityPlatformModule.java b/velocity/src/main/java/org/geysermc/floodgate/module/VelocityPlatformModule.java index d3971fe3..07003c61 100644 --- a/velocity/src/main/java/org/geysermc/floodgate/module/VelocityPlatformModule.java +++ b/velocity/src/main/java/org/geysermc/floodgate/module/VelocityPlatformModule.java @@ -39,6 +39,7 @@ import org.geysermc.floodgate.api.SimpleFloodgateApi; import org.geysermc.floodgate.api.logger.FloodgateLogger; import org.geysermc.floodgate.command.VelocityCommandRegistration; import org.geysermc.floodgate.config.FloodgateConfig; +import org.geysermc.floodgate.config.FloodgateConfigHolder; import org.geysermc.floodgate.config.ProxyFloodgateConfig; import org.geysermc.floodgate.crypto.FloodgateCipher; import org.geysermc.floodgate.inject.CommonPlatformInjector; @@ -109,8 +110,8 @@ public final class VelocityPlatformModule extends AbstractModule { @Provides @Singleton - public PluginMessageHandler pluginMessageHandler() { - return new VelocityPluginMessageHandler(); + public PluginMessageHandler pluginMessageHandler(FloodgateConfigHolder configHolder) { + return new VelocityPluginMessageHandler(configHolder); } /*