Limework/RedisBungee
2
0
Fork 0
mirror of https://github.com/proxiodev/RedisBungee.git synced 2025-03-10 06:35:29 +00:00
Code Releases Activity

make platforms can't see each other when using same redis server and network id

Browse Source
This commit is contained in:
Mohammed Alteneiji 2025-02-21 19:44:52 +04:00
parent 287f037774
commit 8177260991
Signed by: ham1255
GPG Key ID: EF343502046229F4
5 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/main/java/com/imaginarycode/minecraft/redisbungee/api/RedisBungeePlugin.java
View File

@ -92,5 +92,5 @@ public interface RedisBungeePlugin<P> extends EventsPlatform {
void executeAsyncAfter(Runnable runnable, TimeUnit timeUnit, int time); void executeAsyncAfter(Runnable runnable, TimeUnit timeUnit, int time);
String platformId();
} }

5
api/src/main/java/com/imaginarycode/minecraft/redisbungee/api/config/loaders/ConfigLoader.java
View File

@ -97,8 +97,9 @@ public interface ConfigLoader extends GenericConfigLoader {
} }
plugin.logInfo("Loaded network id " + networkId); plugin.logInfo("Loaded network id " + networkId);
// TO avoid proxies from different platforms from seeing each other.
networkId = plugin.platformId() + "-" + networkId;
plugin.logInfo("Platform is {} so network id is now is {}", plugin.platformId(), networkId);
boolean reconnectToLastServer = node.getNode("reconnect-to-last-server").getBoolean(); boolean reconnectToLastServer = node.getNode("reconnect-to-last-server").getBoolean();
boolean handleMotd = node.getNode("handle-motd").getBoolean(true); boolean handleMotd = node.getNode("handle-motd").getBoolean(true);

2
api/src/main/resources/config.yml
View File

@ -50,6 +50,8 @@ useSSL: false
# An identifier for this network, which helps to separate redisbungee instances on same redis instance. # An identifier for this network, which helps to separate redisbungee instances on same redis instance.
# You can use environment variable 'REDISBUNGEE_NETWORK_ID' to override # You can use environment variable 'REDISBUNGEE_NETWORK_ID' to override
# Depending on the platform bungeecord or velocity system will append platform id to the network id
# to prevent proxies from different platforms from seeing each other. since 0.13.0
network-id: "main" network-id: "main"
# An identifier for this BungeeCord / Velocity instance. Will randomly generate if leaving it blank. # An identifier for this BungeeCord / Velocity instance. Will randomly generate if leaving it blank.

6
proxies/bungeecord/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java
View File

@ -355,9 +355,13 @@ public class RedisBungee extends Plugin implements RedisBungeePlugin<ProxiedPlay
return api.getJedisPool(); return api.getJedisPool();
} }
@Override @Override
public void onLangConfigLoad(LangConfiguration langConfiguration) { public void onLangConfigLoad(LangConfiguration langConfiguration) {
this.langConfiguration = langConfiguration; this.langConfiguration = langConfiguration;
} }
@Override
public String platformId() {
return "bungeecord";
}
} }

5
proxies/velocity/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeVelocityPlugin.java
View File

@ -367,4 +367,9 @@ public class RedisBungeeVelocityPlugin implements RedisBungeePlugin<Player>, Con
public InputStream getResourceAsStream(String name) { public InputStream getResourceAsStream(String name) {
return this.getClass().getClassLoader().getResourceAsStream(name); return this.getClass().getClassLoader().getResourceAsStream(name);
} }
@Override
public String platformId() {
return "velocity";
}
} }