diff --git a/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/internal/DataManager.java b/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/internal/DataManager.java index 5be4377..bb9775b 100644 --- a/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/internal/DataManager.java +++ b/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/internal/DataManager.java @@ -171,11 +171,11 @@ public abstract class DataManager
{
switch (action) {
case JOIN:
- final DataManagerMessage message1 = gson.fromJson(jsonObject, new TypeToken {
});
break;
case LEAVE:
- final DataManagerMessage message2 = gson.fromJson(jsonObject, new TypeToken {
});
break;
case SERVER_CHANGE:
- final DataManagerMessage message3 = gson.fromJson(jsonObject, new TypeToken {
}
}
- public static class DataManagerMessage {
+ public static class DataManagerMessage {
return action;
}
- public Payload getPayload() {
+ public T getPayload() {
return payload;
}
@@ -264,11 +264,7 @@ public abstract class DataManager {
}
}
- public static abstract class Payload {
- }
-
-
- public static class LoginPayload extends Payload {
+ public static class LoginPayload {
private final InetAddress address;
public LoginPayload(InetAddress address) {
@@ -280,7 +276,7 @@ public abstract class DataManager {
}
}
- public static class ServerChangePayload extends Payload {
+ public static class ServerChangePayload{
private final String server;
private final String oldServer;
@@ -299,7 +295,7 @@ public abstract class DataManager {
}
- public static class LogoutPayload extends Payload {
+ public static class LogoutPayload {
private final long timestamp;
public LogoutPayload(long timestamp) {
diff --git a/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/internal/RedisUtil.java b/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/internal/RedisUtil.java
index 697a1e6..d70fbe6 100644
--- a/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/internal/RedisUtil.java
+++ b/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/internal/RedisUtil.java
@@ -17,7 +17,7 @@ public class RedisUtil {
rsc.hdel("player:" + player, "server", "ip", "proxy");
long timestamp = System.currentTimeMillis();
rsc.hset("player:" + player, "online", String.valueOf(timestamp));
- rsc.publish("redisbungee-data", gson.toJson(new DataManager.DataManagerMessage(
+ rsc.publish("redisbungee-data", gson.toJson(new DataManager.DataManagerMessage<>(
UUID.fromString(player), RedisBungeeAPI.getRedisBungeeApi().getServerId(), DataManager.DataManagerMessage.Action.LEAVE,
new DataManager.LogoutPayload(timestamp))));
}
@@ -27,7 +27,7 @@ public class RedisUtil {
rsc.hdel("player:" + player, "server", "ip", "proxy");
long timestamp = System.currentTimeMillis();
rsc.hset("player:" + player, "online", String.valueOf(timestamp));
- rsc.publish("redisbungee-data", gson.toJson(new DataManager.DataManagerMessage(
+ rsc.publish("redisbungee-data", gson.toJson(new DataManager.DataManagerMessage<>(
UUID.fromString(player), RedisBungeeAPI.getRedisBungeeApi().getServerId(), DataManager.DataManagerMessage.Action.LEAVE,
new DataManager.LogoutPayload(timestamp))));
}
diff --git a/RedisBungee-Bungee/src/main/java/com/imaginarycode/minecraft/redisbungee/RBUtils.java b/RedisBungee-Bungee/src/main/java/com/imaginarycode/minecraft/redisbungee/RBUtils.java
index 66c0022..580944f 100644
--- a/RedisBungee-Bungee/src/main/java/com/imaginarycode/minecraft/redisbungee/RBUtils.java
+++ b/RedisBungee-Bungee/src/main/java/com/imaginarycode/minecraft/redisbungee/RBUtils.java
@@ -29,7 +29,7 @@ public class RBUtils {
pipeline.hmset("player:" + connection.getUniqueId().toString(), playerData);
if (fireEvent) {
- pipeline.publish("redisbungee-data", gson.toJson(new DataManager.DataManagerMessage(
+ pipeline.publish("redisbungee-data", gson.toJson(new DataManager.DataManagerMessage<>(
connection.getUniqueId(), RedisBungeeAPI.getRedisBungeeApi().getServerId(), DataManager.DataManagerMessage.Action.JOIN,
new DataManager.LoginPayload(connection.getAddress().getAddress()))));
}