Hotfix Update 3.2.1

byRoadrunner · web-flow · commit ea715181231f · 2019-12-29T23:29:49.000+01:00
Default Setup, ServiceInfoSnapshot-OnlineCount and SmartModule AutoStop Hotfix
diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@ defaultTasks 'clean', 'build', 'test', 'jar'
 
 allprojects {
 
-    def major = 3, minor = 2, patch = 0, versionType = "RELEASE"
+    def major = 3, minor = 2, patch = 1, versionType = "RELEASE"
 
     group 'de.dytanic.cloudnet'
     version "$major.$minor.$patch-$versionType"
diff --git a/cloudnet-modules/cloudnet-bridge/src/main/java/de/dytanic/cloudnet/ext/bridge/bukkit/BukkitCloudNetBridgePlugin.java b/cloudnet-modules/cloudnet-bridge/src/main/java/de/dytanic/cloudnet/ext/bridge/bukkit/BukkitCloudNetBridgePlugin.java
@@ -35,7 +35,7 @@ public synchronized void onDisable() {
 
     private void initListeners() {
         //BukkitAPI
-        Bukkit.getServer().getPluginManager().registerEvents(new BukkitPlayerListener(), this);
+        Bukkit.getServer().getPluginManager().registerEvents(new BukkitPlayerListener(this), this);
 
         //CloudNet
         CloudNetDriver.getInstance().getEventManager().registerListener(new BukkitCloudNetListener());
diff --git a/cloudnet-modules/cloudnet-bridge/src/main/java/de/dytanic/cloudnet/ext/bridge/bukkit/listener/BukkitPlayerListener.java b/cloudnet-modules/cloudnet-bridge/src/main/java/de/dytanic/cloudnet/ext/bridge/bukkit/listener/BukkitPlayerListener.java
@@ -5,6 +5,7 @@
 import de.dytanic.cloudnet.ext.bridge.BridgeConfiguration;
 import de.dytanic.cloudnet.ext.bridge.BridgeConfigurationProvider;
 import de.dytanic.cloudnet.ext.bridge.BridgeHelper;
+import de.dytanic.cloudnet.ext.bridge.bukkit.BukkitCloudNetBridgePlugin;
 import de.dytanic.cloudnet.ext.bridge.bukkit.BukkitCloudNetHelper;
 import de.dytanic.cloudnet.wrapper.Wrapper;
 import org.bukkit.Bukkit;
@@ -19,11 +20,14 @@
 
 public final class BukkitPlayerListener implements Listener {
 
+    private final BukkitCloudNetBridgePlugin plugin;
+
     private final BridgeConfiguration bridgeConfiguration;
 
     private final boolean onlyProxyProtection;
 
-    public BukkitPlayerListener() {
+    public BukkitPlayerListener(BukkitCloudNetBridgePlugin plugin) {
+        this.plugin = plugin;
         this.bridgeConfiguration = BridgeConfigurationProvider.load();
         this.onlyProxyProtection = !Bukkit.getOnlineMode()
                 && this.bridgeConfiguration != null
@@ -71,7 +75,7 @@ public void handle(PlayerQuitEvent event) {
         BridgeHelper.sendChannelMessageServerDisconnect(BukkitCloudNetHelper.createNetworkConnectionInfo(event.getPlayer()),
                 BukkitCloudNetHelper.createNetworkPlayerServerInfo(event.getPlayer(), false));
 
-        BridgeHelper.updateServiceInfo();
+        Bukkit.getScheduler().runTask(this.plugin, BridgeHelper::updateServiceInfo);
     }
 
 }
diff --git a/cloudnet-modules/cloudnet-bridge/src/main/java/de/dytanic/cloudnet/ext/bridge/bungee/BungeeCloudNetBridgePlugin.java b/cloudnet-modules/cloudnet-bridge/src/main/java/de/dytanic/cloudnet/ext/bridge/bungee/BungeeCloudNetBridgePlugin.java
@@ -65,7 +65,7 @@ private void registerCommands() {
 
     private void initListeners() {
         //BungeeCord API
-        ProxyServer.getInstance().getPluginManager().registerListener(this, new BungeePlayerListener());
+        ProxyServer.getInstance().getPluginManager().registerListener(this, new BungeePlayerListener(this));
 
         //CloudNet
         CloudNetDriver.getInstance().getEventManager().registerListener(new BungeeCloudNetListener());
diff --git a/cloudnet-modules/cloudnet-bridge/src/main/java/de/dytanic/cloudnet/ext/bridge/bungee/listener/BungeePlayerListener.java b/cloudnet-modules/cloudnet-bridge/src/main/java/de/dytanic/cloudnet/ext/bridge/bungee/listener/BungeePlayerListener.java
@@ -2,6 +2,7 @@
 
 import de.dytanic.cloudnet.driver.service.ServiceInfoSnapshot;
 import de.dytanic.cloudnet.ext.bridge.BridgeHelper;
+import de.dytanic.cloudnet.ext.bridge.bungee.BungeeCloudNetBridgePlugin;
 import de.dytanic.cloudnet.ext.bridge.bungee.BungeeCloudNetHelper;
 import de.dytanic.cloudnet.ext.bridge.player.NetworkServiceInfo;
 import net.md_5.bungee.api.ProxyServer;
@@ -11,8 +12,16 @@
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.event.EventHandler;
 
+import java.util.concurrent.TimeUnit;
+
 public final class BungeePlayerListener implements Listener {
 
+    private BungeeCloudNetBridgePlugin plugin;
+
+    public BungeePlayerListener(BungeeCloudNetBridgePlugin plugin) {
+        this.plugin = plugin;
+    }
+
     @EventHandler
     public void handle(LoginEvent event) {
         BridgeHelper.sendChannelMessageProxyLoginRequest(BungeeCloudNetHelper.createNetworkConnectionInfo(event.getConnection()));
@@ -77,6 +86,6 @@ public void handle(ServerKickEvent event) {
     public void handle(PlayerDisconnectEvent event) {
         BridgeHelper.sendChannelMessageProxyDisconnect(BungeeCloudNetHelper.createNetworkConnectionInfo(event.getPlayer().getPendingConnection()));
 
-        BridgeHelper.updateServiceInfo();
+        ProxyServer.getInstance().getScheduler().schedule(this.plugin, BridgeHelper::updateServiceInfo, 50, TimeUnit.MILLISECONDS);
     }
 }
diff --git a/cloudnet-modules/cloudnet-bridge/src/main/java/de/dytanic/cloudnet/ext/bridge/nukkit/listener/NukkitPlayerListener.java b/cloudnet-modules/cloudnet-bridge/src/main/java/de/dytanic/cloudnet/ext/bridge/nukkit/listener/NukkitPlayerListener.java
@@ -8,6 +8,7 @@
 import cn.nukkit.event.player.PlayerJoinEvent;
 import cn.nukkit.event.player.PlayerLoginEvent;
 import cn.nukkit.event.player.PlayerQuitEvent;
+import cn.nukkit.scheduler.Task;
 import de.dytanic.cloudnet.common.collection.Iterables;
 import de.dytanic.cloudnet.driver.service.ServiceTask;
 import de.dytanic.cloudnet.ext.bridge.BridgeConfiguration;
@@ -70,7 +71,12 @@ public void handle(PlayerQuitEvent event) {
         BridgeHelper.sendChannelMessageServerDisconnect(NukkitCloudNetHelper.createNetworkConnectionInfo(event.getPlayer()),
                 NukkitCloudNetHelper.createNetworkPlayerServerInfo(event.getPlayer(), false));
 
-        BridgeHelper.updateServiceInfo();
+        event.getPlayer().getServer().getScheduler().scheduleDelayedTask(new Task() {
+            @Override
+            public void onRun(int currentTick) {
+                BridgeHelper.updateServiceInfo();
+            }
+        }, 1);
     }
 
 }
diff --git a/cloudnet-modules/cloudnet-bridge/src/main/java/de/dytanic/cloudnet/ext/bridge/sponge/SpongeCloudNetBridgePlugin.java b/cloudnet-modules/cloudnet-bridge/src/main/java/de/dytanic/cloudnet/ext/bridge/sponge/SpongeCloudNetBridgePlugin.java
@@ -39,7 +39,7 @@ public synchronized void handle(GameStoppingServerEvent event) {
 
     private void initListeners() {
         //Sponge API
-        Sponge.getEventManager().registerListeners(this, new SpongePlayerListener());
+        Sponge.getEventManager().registerListeners(this, new SpongePlayerListener(this));
 
         //CloudNet
         CloudNetDriver.getInstance().getEventManager().registerListener(new SpongeCloudNetListener());
diff --git a/cloudnet-modules/cloudnet-bridge/src/main/java/de/dytanic/cloudnet/ext/bridge/sponge/listener/SpongePlayerListener.java b/cloudnet-modules/cloudnet-bridge/src/main/java/de/dytanic/cloudnet/ext/bridge/sponge/listener/SpongePlayerListener.java
@@ -1,26 +1,35 @@
 package de.dytanic.cloudnet.ext.bridge.sponge.listener;
 
 import de.dytanic.cloudnet.ext.bridge.BridgeHelper;
+import de.dytanic.cloudnet.ext.bridge.sponge.SpongeCloudNetBridgePlugin;
 import de.dytanic.cloudnet.ext.bridge.sponge.SpongeCloudNetHelper;
+import org.spongepowered.api.Sponge;
 import org.spongepowered.api.event.Listener;
 import org.spongepowered.api.event.network.ClientConnectionEvent;
+import org.spongepowered.api.scheduler.SpongeExecutorService;
 
 public final class SpongePlayerListener {
 
+    private SpongeExecutorService executorService;
+
+    public SpongePlayerListener(SpongeCloudNetBridgePlugin plugin) {
+        this.executorService = Sponge.getGame().getScheduler().createSyncExecutor(plugin);
+    }
+
     @Listener
     public void handle(ClientConnectionEvent.Join event) {
         BridgeHelper.sendChannelMessageServerLoginSuccess(SpongeCloudNetHelper.createNetworkConnectionInfo(event.getTargetEntity()),
                 SpongeCloudNetHelper.createNetworkPlayerServerInfo(event.getTargetEntity(), false)
         );
 
-        BridgeHelper.updateServiceInfo();
+        this.executorService.execute(BridgeHelper::updateServiceInfo);
     }
 
     @Listener
     public void handle(ClientConnectionEvent.Disconnect event) {
         BridgeHelper.sendChannelMessageServerDisconnect(SpongeCloudNetHelper.createNetworkConnectionInfo(event.getTargetEntity()),
                 SpongeCloudNetHelper.createNetworkPlayerServerInfo(event.getTargetEntity(), false));
 
-        BridgeHelper.updateServiceInfo();
+        this.executorService.execute(BridgeHelper::updateServiceInfo);
     }
 }
diff --git a/cloudnet-modules/cloudnet-bridge/src/main/java/de/dytanic/cloudnet/ext/bridge/velocity/VelocityCloudNetBridgePlugin.java b/cloudnet-modules/cloudnet-bridge/src/main/java/de/dytanic/cloudnet/ext/bridge/velocity/VelocityCloudNetBridgePlugin.java
@@ -53,7 +53,7 @@ public void handleShutdown(ProxyShutdownEvent event) {
 
     private void initListeners() {
         //Velocity API
-        this.proxyServer.getEventManager().register(this, new VelocityPlayerListener());
+        this.proxyServer.getEventManager().register(this, new VelocityPlayerListener(this));
 
         //CloudNet
         CloudNetDriver.getInstance().getEventManager().registerListener(new VelocityCloudNetListener());
diff --git a/cloudnet-modules/cloudnet-bridge/src/main/java/de/dytanic/cloudnet/ext/bridge/velocity/listener/VelocityPlayerListener.java b/cloudnet-modules/cloudnet-bridge/src/main/java/de/dytanic/cloudnet/ext/bridge/velocity/listener/VelocityPlayerListener.java
@@ -10,11 +10,20 @@
 import de.dytanic.cloudnet.driver.service.ServiceInfoSnapshot;
 import de.dytanic.cloudnet.ext.bridge.BridgeHelper;
 import de.dytanic.cloudnet.ext.bridge.player.NetworkServiceInfo;
+import de.dytanic.cloudnet.ext.bridge.velocity.VelocityCloudNetBridgePlugin;
 import de.dytanic.cloudnet.ext.bridge.velocity.VelocityCloudNetHelper;
 import net.kyori.text.TextComponent;
 
+import java.util.concurrent.TimeUnit;
+
 public final class VelocityPlayerListener {
 
+    private VelocityCloudNetBridgePlugin plugin;
+
+    public VelocityPlayerListener(VelocityCloudNetBridgePlugin plugin) {
+        this.plugin = plugin;
+    }
+
     @Subscribe
     public void handle(LoginEvent event) {
         BridgeHelper.sendChannelMessageProxyLoginRequest(VelocityCloudNetHelper.createNetworkConnectionInfo(event.getPlayer()));
@@ -24,7 +33,8 @@ public void handle(LoginEvent event) {
     public void handle(PostLoginEvent event) {
         BridgeHelper.sendChannelMessageProxyLoginSuccess(VelocityCloudNetHelper.createNetworkConnectionInfo(event.getPlayer()));
 
-        VelocityCloudNetHelper.updateServiceInfo();
+        VelocityCloudNetHelper.getProxyServer().getScheduler().buildTask(this.plugin, VelocityCloudNetHelper::updateServiceInfo)
+                .delay(50, TimeUnit.MILLISECONDS).schedule();
     }
 
     @Subscribe
@@ -82,6 +92,7 @@ public void handle(KickedFromServerEvent event) {
     public void handle(DisconnectEvent event) {
         BridgeHelper.sendChannelMessageProxyDisconnect(VelocityCloudNetHelper.createNetworkConnectionInfo(event.getPlayer()));
 
-        VelocityCloudNetHelper.updateServiceInfo();
+        VelocityCloudNetHelper.getProxyServer().getScheduler().buildTask(this.plugin, VelocityCloudNetHelper::updateServiceInfo)
+                .delay(50, TimeUnit.MILLISECONDS).schedule();
     }
 }
diff --git a/cloudnet-modules/cloudnet-smart/src/main/java/de/dytanic/cloudnet/ext/smart/listener/CloudNetTickListener.java b/cloudnet-modules/cloudnet-smart/src/main/java/de/dytanic/cloudnet/ext/smart/listener/CloudNetTickListener.java
@@ -19,6 +19,7 @@
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
 
 public final class CloudNetTickListener {
 
@@ -67,12 +68,16 @@ private void autoGeneratePreparedServices(SmartServiceTaskConfig task, ServiceTa
     }
 
     private void handleAutoStop() {
-        Collection<ServiceInfoSnapshot> serviceInfoSnapshots = Iterables.filter(CloudNetDriver.getInstance().getCloudServiceProvider().getCloudServices(), cloudService -> CloudNetSmartModule.getInstance().getProvidedSmartServices().containsKey(cloudService.getServiceId().getUniqueId()) &&
-                cloudService.getLifeCycle() == ServiceLifeCycle.RUNNING &&
-                cloudService.getProperties().contains("Online-Count") &&
-                cloudService.getProperties().contains("Max-Players"));
-
-        for (ServiceInfoSnapshot serviceInfoSnapshot : serviceInfoSnapshots) {
+        Collection<ServiceInfoSnapshot> runningServiceInfoSnapshots = CloudNetDriver.getInstance().getCloudServiceProvider().getCloudServices()
+                .stream()
+                .filter(serviceInfoSnapshot -> serviceInfoSnapshot.getLifeCycle() == ServiceLifeCycle.RUNNING)
+                .collect(Collectors.toList());
+        Collection<ServiceInfoSnapshot> onlineServiceInfoSnapshots = runningServiceInfoSnapshots.stream()
+                .filter(serviceInfoSnapshot -> serviceInfoSnapshot.getProperties().contains("Online-Count"))
+                .filter(serviceInfoSnapshot -> serviceInfoSnapshot.getProperties().contains("Max-Players"))
+                .collect(Collectors.toList());
+
+        for (ServiceInfoSnapshot serviceInfoSnapshot : onlineServiceInfoSnapshots) {
             SmartServiceTaskConfig smartTask = CloudNetSmartModule.getInstance().getSmartServiceTaskConfig(serviceInfoSnapshot);
             if (smartTask == null) {
                 continue;
@@ -88,9 +93,9 @@ private void handleAutoStop() {
                             serviceInfoSnapshot.getProperties().getInt("Max-Players")
                     ) <= smartTask.getPercentOfPlayersToCheckShouldAutoStopTheServiceInFuture()) {
 
-                int onlineServices = CloudNet.getInstance().getCloudServiceProvider().getServicesCountByTask(serviceInfoSnapshot.getServiceId().getTaskName());
+                int runningServices = (int) runningServiceInfoSnapshots.stream().filter(runningServiceInfoSnapshot -> runningServiceInfoSnapshot.getServiceId().getTaskName().equals(serviceInfoSnapshot.getServiceId().getTaskName())).count();
                 ServiceTask serviceTask = CloudNet.getInstance().getServiceTaskProvider().getServiceTask(serviceInfoSnapshot.getServiceId().getTaskName());
-                if (onlineServices <= serviceTask.getMinServiceCount()) {
+                if (runningServices <= serviceTask.getMinServiceCount()) {
                     continue;
                 }
 
diff --git a/cloudnet/src/main/java/de/dytanic/cloudnet/DefaultInstallation.java b/cloudnet/src/main/java/de/dytanic/cloudnet/DefaultInstallation.java
@@ -198,7 +198,7 @@ public List<String> getCompletableAnswers() {
                 if (animation.hasResult("internalHost")) {
                     HostAndPort defaultHost = (HostAndPort) animation.getResult("internalHost");
 
-                    this.cloudNet.getConfig().setDefaultHostAddress(defaultHost.getHost());
+                    this.cloudNet.getConfig().setHostAddress(defaultHost.getHost());
                     this.cloudNet.getConfig().setIdentity(new NetworkClusterNode(
                             animation.hasResult("nodeId") ? (String) animation.getResult("nodeId") : "Node-" + UUID.randomUUID().toString().split("-")[0],
                             new HostAndPort[]{defaultHost}
diff --git a/cloudnet/src/main/java/de/dytanic/cloudnet/conf/IConfiguration.java b/cloudnet/src/main/java/de/dytanic/cloudnet/conf/IConfiguration.java
@@ -18,6 +18,8 @@ public interface IConfiguration {
 
     String getHostAddress();
 
+    void setHostAddress(String hostAddress);
+
     NetworkClusterNode getIdentity();
 
     void setIdentity(NetworkClusterNode identity);
diff --git a/cloudnet/src/main/java/de/dytanic/cloudnet/conf/JsonConfiguration.java b/cloudnet/src/main/java/de/dytanic/cloudnet/conf/JsonConfiguration.java
@@ -26,7 +26,7 @@ public final class JsonConfiguration implements IConfiguration {
     }.getType(),
             CLUSTER = new TypeToken<NetworkCluster>() {
             }.getType(),
-            COLLECTION_STRING = new TypeToken<Collection<String>>() {
+            SET_STRING = new TypeToken<Set<String>>() {
             }.getType(),
             HOST_AND_PORT_COLLECTION = new TypeToken<Collection<HostAndPort>>() {
             }.getType();
@@ -105,7 +105,7 @@ public void load() {
             addresses.addAll(Arrays.asList(System.getenv("CLOUDNET_DEFAULT_IP_WHITELIST").split(",")));
         }
 
-        this.ipWhitelist = this.document.get("ipWhitelist", COLLECTION_STRING, addresses);
+        this.ipWhitelist = this.document.get("ipWhitelist", SET_STRING, addresses);
 
         this.clusterConfig = this.document.get("cluster", CLUSTER, new NetworkCluster(
                 System.getenv("CLOUDNET_CLUSTER_ID") != null ?
@@ -303,6 +303,11 @@ public void setHttpListeners(Collection<HostAndPort> httpListeners) {
         this.save();
     }
 
+    @Override
+    public void setHostAddress(String hostAddress) {
+        this.hostAddress = hostAddress;
+    }
+
     public ConfigurationOptionSSL getClientSslConfig() {
         return this.clientSslConfig;
     }
