From 101f7207a9fc4fb1f9e35abfa7e03248e35e6c1c Mon Sep 17 00:00:00 2001 From: games647 Date: Tue, 7 Aug 2018 13:41:22 +0200 Subject: [PATCH] Limit plugin channels to 16 characters for 1.7 support Fixes #223 --- .../games647/fastlogin/core/message/ChangePremiumMessage.java | 2 +- .../games647/fastlogin/core/message/LoginActionMessage.java | 2 +- .../github/games647/fastlogin/core/message/NamespaceKey.java | 4 +++- .../games647/fastlogin/core/message/SuccessMessage.java | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/com/github/games647/fastlogin/core/message/ChangePremiumMessage.java b/core/src/main/java/com/github/games647/fastlogin/core/message/ChangePremiumMessage.java index d59ea8b0..8ad2e7c2 100644 --- a/core/src/main/java/com/github/games647/fastlogin/core/message/ChangePremiumMessage.java +++ b/core/src/main/java/com/github/games647/fastlogin/core/message/ChangePremiumMessage.java @@ -5,7 +5,7 @@ import com.google.common.io.ByteArrayDataOutput; public class ChangePremiumMessage implements ChannelMessage { - public static final String CHANGE_CHANNEL = "ch-status"; + public static final String CHANGE_CHANNEL = "ch-st"; private String playerName; private boolean willEnable; diff --git a/core/src/main/java/com/github/games647/fastlogin/core/message/LoginActionMessage.java b/core/src/main/java/com/github/games647/fastlogin/core/message/LoginActionMessage.java index 8565bee5..69353a8a 100644 --- a/core/src/main/java/com/github/games647/fastlogin/core/message/LoginActionMessage.java +++ b/core/src/main/java/com/github/games647/fastlogin/core/message/LoginActionMessage.java @@ -7,7 +7,7 @@ import java.util.UUID; public class LoginActionMessage implements ChannelMessage { - public static final String FORCE_CHANNEL = "force-act"; + public static final String FORCE_CHANNEL = "force"; private Type type; diff --git a/core/src/main/java/com/github/games647/fastlogin/core/message/NamespaceKey.java b/core/src/main/java/com/github/games647/fastlogin/core/message/NamespaceKey.java index ec9dad5a..e0e97018 100644 --- a/core/src/main/java/com/github/games647/fastlogin/core/message/NamespaceKey.java +++ b/core/src/main/java/com/github/games647/fastlogin/core/message/NamespaceKey.java @@ -2,6 +2,8 @@ package com.github.games647.fastlogin.core.message; public class NamespaceKey { + private static final char SEPARATOR_CHAR = ':'; + private final String namespace; private final String key; @@ -11,7 +13,7 @@ public class NamespaceKey { this.namespace = namespace.toLowerCase(); this.key = key.toLowerCase(); - this.combined = this.namespace + ':' + this.key; + this.combined = this.namespace + SEPARATOR_CHAR + this.key; } public String getCombinedName() { diff --git a/core/src/main/java/com/github/games647/fastlogin/core/message/SuccessMessage.java b/core/src/main/java/com/github/games647/fastlogin/core/message/SuccessMessage.java index f834dcba..75555ab3 100644 --- a/core/src/main/java/com/github/games647/fastlogin/core/message/SuccessMessage.java +++ b/core/src/main/java/com/github/games647/fastlogin/core/message/SuccessMessage.java @@ -5,7 +5,7 @@ import com.google.common.io.ByteArrayDataOutput; public class SuccessMessage implements ChannelMessage { - public static final String SUCCESS_CHANNEL = "success"; + public static final String SUCCESS_CHANNEL = "succ"; @Override public String getChannelName() {