Fire PlayerSettingsChangedEvent event when PlayerSettings are provide…

…d in the Configuration phase (#1118)
PaperMC · Oct 29, 2023 · 2e8ef8b · 2e8ef8b
1 parent f87b05a
commit 2e8ef8b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/...src/main/java/com/velocitypowered/proxy/connection/client/ClientConfigSessionHandler.java b/...src/main/java/com/velocitypowered/proxy/connection/client/ClientConfigSessionHandler.java
@@ -87,7 +87,7 @@ public boolean handle(KeepAlive packet) {
 
   @Override
   public boolean handle(ClientSettings packet) {
-    player.setClientSettingsPacket(packet);
+    player.setClientSettings(packet);
     return true;
   }
 

diff --git a/...y/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java b/...y/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java
@@ -186,7 +186,7 @@ public boolean handle(KeepAlive packet) {
 
   @Override
   public boolean handle(ClientSettings packet) {
-    player.setPlayerSettings(packet);
+    player.setClientSettings(packet);
     VelocityServerConnection serverConnection = player.getConnectedServer();
     if (serverConnection == null) {
       // No server connection yet, probably transitioning.

diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
@@ -282,12 +282,14 @@ public boolean hasSentPlayerSettings() {
     return settings != null;
   }
 
-  public void setClientSettingsPacket(ClientSettings clientSettingsPacket) {
+  /**
+   * Sets player settings.
+   *
+   * @param clientSettingsPacket the player settings packet
+   */
+  public void setClientSettings(final ClientSettings clientSettingsPacket) {
     this.clientSettingsPacket = clientSettingsPacket;
-  }
-
-  void setPlayerSettings(ClientSettings settings) {
-    ClientSettingsWrapper cs = new ClientSettingsWrapper(settings);
+    final ClientSettingsWrapper cs = new ClientSettingsWrapper(clientSettingsPacket);
     this.settings = cs;
     server.getEventManager().fireAndForget(new PlayerSettingsChangedEvent(this, cs));
   }