Skip to content

Commit

Permalink
Update SubData
Browse files Browse the repository at this point in the history
  • Loading branch information
@ME1312
ME1312 committed Nov 23, 2020
1 parent 80da5f7 commit bcd7f4f
Show file tree
Hide file tree
Showing 13 changed files with 45 additions and 27 deletions.
2 changes: 1 addition & 1 deletion SubServers.Bungee/pom.xml
View file
Expand Up @@ -50,7 +50,7 @@
<dependency>
<groupId>net.ME1312.SubData</groupId>
<artifactId>Server</artifactId>
<version>20w46d</version>
<version>20w48a</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
Expand Down
4 changes: 3 additions & 1 deletion SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkExHost.java
View file
Expand Up @@ -85,11 +85,13 @@ public void receive(SubDataClient client, ObjectMap<Integer> data) {

private void queue(String name, Runnable action) {
final long now = Calendar.getInstance().getTime().getTime();
new Timer("SubServers.Bungee::ExHost_Linker(" + name + ")").schedule(new TimerTask() {
Timer timer = new Timer("SubServers.Bungee::ExHost_Linker(" + name + ")");
timer.schedule(new TimerTask() {
@Override
public void run() {
action.run();
--req;
timer.cancel();
}
}, (now - last < 500) ? (req * 500) : 0);

Expand Down
4 changes: 3 additions & 1 deletion SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkProxy.java
View file
Expand Up @@ -91,11 +91,13 @@ public void receive(SubDataClient client, ObjectMap<Integer> data) {

private void queue(String name, Runnable action) {
final long now = Calendar.getInstance().getTime().getTime();
new Timer("SubServers.Bungee::Proxy_Linker(" + name + ")").schedule(new TimerTask() {
Timer timer = new Timer("SubServers.Bungee::Proxy_Linker(" + name + ")");
timer.schedule(new TimerTask() {
@Override
public void run() {
action.run();
--req;
timer.cancel();
}
}, (now - last < 500) ? (req * 500) : 0);

Expand Down
4 changes: 3 additions & 1 deletion SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkServer.java
View file
Expand Up @@ -129,10 +129,12 @@ private void link(SubDataClient client, Server server, int channel) throws Throw
};

final long now = Calendar.getInstance().getTime().getTime();
new Timer("SubServers.Bungee::Server_Linker(" + server.getName() + ")").schedule(new TimerTask() {
Timer timer = new Timer("SubServers.Bungee::Server_Linker(" + server.getName() + ")");
timer.schedule(new TimerTask() {
@Override
public void run() {
register.run();
timer.cancel();
}
}, ((server instanceof SubServer && !((SubServer) server).isRunning()) ? TimeUnit.SECONDS.toMillis(5) : 0) + ((now - last < 500) ? (req * 500) : 0));

Expand Down
20 changes: 12 additions & 8 deletions SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubProxy.java
View file
Expand Up @@ -992,15 +992,19 @@ public void connected(ServerConnectedEvent e) {
}


if (fallbackLimbo.keySet().contains(e.getPlayer().getUniqueId())) new Timer("SubServers.Bungee::Fallback_Limbo_Timer(" + e.getPlayer().getUniqueId() + ')').schedule(new TimerTask() {
@Override
public void run() {
if (e.getPlayer().getServer() != null && !((UserConnection) e.getPlayer()).isDimensionChange() && e.getPlayer().getServer().getInfo().getAddress().equals(e.getServer().getInfo().getAddress())) {
fallbackLimbo.remove(e.getPlayer().getUniqueId());
e.getPlayer().sendMessage(api.getLang("SubServers", "Bungee.Feature.Smart-Fallback.Result").replace("$str$", (e.getServer().getInfo() instanceof Server)?((Server) e.getServer().getInfo()).getDisplayName():e.getServer().getInfo().getName()));
if (fallbackLimbo.keySet().contains(e.getPlayer().getUniqueId())) {
Timer timer = new Timer("SubServers.Bungee::Fallback_Limbo_Timer(" + e.getPlayer().getUniqueId() + ')');
timer.schedule(new TimerTask() {
@Override
public void run() {
if (e.getPlayer().getServer() != null && !((UserConnection) e.getPlayer()).isDimensionChange() && e.getPlayer().getServer().getInfo().getAddress().equals(e.getServer().getInfo().getAddress())) {
fallbackLimbo.remove(e.getPlayer().getUniqueId());
e.getPlayer().sendMessage(api.getLang("SubServers", "Bungee.Feature.Smart-Fallback.Result").replace("$str$", (e.getServer().getInfo() instanceof Server)?((Server) e.getServer().getInfo()).getDisplayName():e.getServer().getInfo().getName()));
}
timer.cancel();
}
}
}, 1000);
}, 1000);
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion SubServers.Client/Bukkit/pom.xml
View file
Expand Up @@ -62,7 +62,7 @@
<dependency>
<groupId>net.ME1312.SubData</groupId>
<artifactId>Client</artifactId>
<version>20w46d</version>
<version>20w48a</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion SubServers.Client/Common/pom.xml
View file
Expand Up @@ -26,7 +26,7 @@
<dependency>
<groupId>net.ME1312.SubData</groupId>
<artifactId>Client</artifactId>
<version>20w46d</version>
<version>20w48a</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion SubServers.Client/Sponge/pom.xml
View file
Expand Up @@ -44,7 +44,7 @@
<dependency>
<groupId>net.ME1312.SubData</groupId>
<artifactId>Client</artifactId>
<version>20w46d</version>
<version>20w48a</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion SubServers.Host/pom.xml
View file
Expand Up @@ -34,7 +34,7 @@
<dependency>
<groupId>net.ME1312.SubData</groupId>
<artifactId>Client</artifactId>
<version>20w46d</version>
<version>20w48a</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
Expand Down
4 changes: 3 additions & 1 deletion SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java
View file
Expand Up @@ -544,11 +544,13 @@ public void run(ObjectMap<String> json) {
PacketInExRunEvent.callback("SubStoppedEvent", this);
String name = json.getString("server").toLowerCase();
if (listening.keySet().contains(name)) {
new Timer("SubServers.Sync::Server_Restart_Command_Handler(" + name + ")").schedule(new TimerTask() {
Timer timer = new Timer("SubServers.Host::Server_Restart_Command_Handler(" + name + ")");
timer.schedule(new TimerTask() {
@Override
public void run() {
starter.run(listening.get(name));
listening.remove(name);
timer.cancel();
}
}, 100);
}
Expand Down
2 changes: 1 addition & 1 deletion SubServers.Sync/pom.xml
View file
Expand Up @@ -57,7 +57,7 @@
<dependency>
<groupId>net.ME1312.SubData</groupId>
<artifactId>Client</artifactId>
<version>20w46d</version>
<version>20w48a</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
Expand Down
20 changes: 12 additions & 8 deletions SubServers.Sync/src/net/ME1312/SubServers/Sync/ExProxy.java
View file
Expand Up @@ -525,15 +525,19 @@ public void connected(ServerConnectedEvent e) {
}


if (fallbackLimbo.keySet().contains(e.getPlayer().getUniqueId())) new Timer("SubServers.Sync::Fallback_Limbo_Timer(" + e.getPlayer().getUniqueId() + ')').schedule(new TimerTask() {
@Override
public void run() {
if (e.getPlayer().getServer() != null && !((UserConnection) e.getPlayer()).isDimensionChange() && e.getPlayer().getServer().getInfo().getAddress().equals(e.getServer().getInfo().getAddress())) {
fallbackLimbo.remove(e.getPlayer().getUniqueId());
e.getPlayer().sendMessage(api.getLang("SubServers", "Bungee.Feature.Smart-Fallback.Result").replace("$str$", (e.getServer().getInfo() instanceof ServerImpl)?((ServerImpl) e.getServer().getInfo()).getDisplayName():e.getServer().getInfo().getName()));
if (fallbackLimbo.keySet().contains(e.getPlayer().getUniqueId())) {
Timer timer = new Timer("SubServers.Sync::Fallback_Limbo_Timer(" + e.getPlayer().getUniqueId() + ')');
timer.schedule(new TimerTask() {
@Override
public void run() {
if (e.getPlayer().getServer() != null && !((UserConnection) e.getPlayer()).isDimensionChange() && e.getPlayer().getServer().getInfo().getAddress().equals(e.getServer().getInfo().getAddress())) {
fallbackLimbo.remove(e.getPlayer().getUniqueId());
e.getPlayer().sendMessage(api.getLang("SubServers", "Bungee.Feature.Smart-Fallback.Result").replace("$str$", (e.getServer().getInfo() instanceof ServerImpl)?((ServerImpl) e.getServer().getInfo()).getDisplayName():e.getServer().getInfo().getName()));
}
timer.cancel();
}
}
}, 1000);
}, 1000);
}
}
}

Expand Down
4 changes: 3 additions & 1 deletion SubServers.Sync/src/net/ME1312/SubServers/Sync/SubCommand.java
View file
Expand Up @@ -453,11 +453,13 @@ public void run(ObjectMap<String> json) {
PacketInExRunEvent.callback("SubStoppedEvent", this);
String name = json.getString("server").toLowerCase();
if (listening.keySet().contains(name)) {
new Timer("SubServers.Sync::Server_Restart_Command_Handler(" + name + ")").schedule(new TimerTask() {
Timer timer = new Timer("SubServers.Sync::Server_Restart_Command_Handler(" + name + ")");
timer.schedule(new TimerTask() {
@Override
public void run() {
starter.run(listening.get(name));
listening.remove(name);
timer.cancel();
}
}, 100);
}
Expand Down

0 comments on commit bcd7f4f

Please sign in to comment.