👮‍♂️ Spigot extension for permission on private server & Bug fixes

README.md

@@ -16,6 +16,10 @@ Create your own private game servers and invite your friends to play with you. O
 + privateserver.premium To start more than one server (Configurable in the config)
 + privateserver.list To get a more detailed list of servers running
 
+Furthermore, you can give every server owner on their private server any permissions you like.
+Install the same plugin on your spigot server and add permissions in the config.json. Easy!
+This enables features like trolling, forcing maps, force starts, etc.
+
 ### Features:
 + Server starting title 
 
@@ -29,6 +33,7 @@ Create your own private game servers and invite your friends to play with you. O
 
 ![Invitation receiver](https://i.ibb.co/VtmQBtg/image.png "invitation")
 
++ Permissions for private server owners
 + Messages are editable in the config
 + Frequent updates
 
@@ -39,13 +44,15 @@ Create your own private game servers and invite your friends to play with you. O
 + Startable groups
 + Max servers running on the whole server
 + Max servers per user
-+ Momory editable
++ Memory editable
++ Permissions for server owners editable
 
 ### Installation:
 1. Download the .jar
-2. Drag the .jar files into your plugin folder
+2. Drag the .jar file into your plugin folder
 3. Restart your BungeeCord server
 4. Optional: Edit config.json and restart again
+5. Optional: Copy the .jar file into your global/spigot group folder 
 
 ### Bugs / Questions?
 Discord: https://discord.gg/2aSSGcz  

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>de.luuuuuis</groupId>
     <artifactId>PrivateServer</artifactId>
-    <version>0.6.1</version>
+    <version>0.7</version>
 
     <build>
         <plugins>

src/main/java/de/luuuuuis/privateserver/bungee/PrivateServer.java

@@ -30,7 +30,7 @@ public void onDisable() {
          * Sometimes only works when the BungeeCord is stopped with /end
          * kinda weird of CloudNet idk
          */
-        CloudServer.getCloudServers().forEach(CloudServer::stop);
+        CloudServer.getCloudServers().forEach(CloudServer::remove);
     }
 
     @Override

src/main/java/de/luuuuuis/privateserver/bungee/commands/PrivateServerCmd.java

@@ -151,7 +151,7 @@ public void execute(CommandSender sender, String[] strings) {
 
                 CloudServer privateServer = owner.getServers().stream().filter(priServer -> priServer.getName().equalsIgnoreCase(server)).findFirst().orElse(null);
                 if (privateServer != null) {
-                    privateServer.stop();
+                    privateServer.remove();
                 } else {
                     p.sendMessage(TextComponent.fromLegacyText(Config.getInstance().getPrefix() + "§cYou cannot stop that server."));
                 }

src/main/java/de/luuuuuis/privateserver/bungee/events/DisconnectListener.java

@@ -22,7 +22,7 @@ public void stopServers(PlayerDisconnectEvent e) {
 
         //Avoiding ConcurrentModificationException
         new ArrayList<>(owner.getServers())
-                .forEach(CloudServer::stop);
+                .forEach(CloudServer::remove);
     }
 
     @EventHandler

src/main/java/de/luuuuuis/privateserver/bungee/events/ServerSwitch.java

@@ -1,7 +1,7 @@
 package de.luuuuuis.privateserver.bungee.events;
 
+import de.dytanic.cloudnet.bridge.event.proxied.ProxiedServerRemoveEvent;
 import de.luuuuuis.privateserver.bungee.util.CloudServer;
-import de.luuuuuis.privateserver.bungee.util.Config;
 import de.luuuuuis.privateserver.bungee.util.Owner;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.event.ServerSwitchEvent;
@@ -10,13 +10,6 @@
 
 public class ServerSwitch implements Listener {
 
-    //TODO: CloudServer shutdown event!
-
-    @EventHandler
-    public void onShutdown() {
-        CloudServer.getCloudServers().stream().filter(cloudServer -> cloudServer.getName().equals(e.getServerInfo().getServiceId().getServerId())).findFirst().ifPresent(CloudServer::stop);
-    }
-
     @EventHandler
     public void onServerSwitch(ServerSwitchEvent e) {
         ProxiedPlayer p = e.getPlayer();
@@ -27,10 +20,12 @@ public void onServerSwitch(ServerSwitchEvent e) {
         if (p.hasPermission("privateserver.premium"))
             return;
 
-        owner.getServers().stream().filter(cloudServer -> cloudServer.getName().equals(e.getFrom().getName())).findFirst().ifPresent(cloudServer -> {
-            owner.sendMessage(Config.getInstance().getPrefix() + "§cYour server was shutdown due to performance saving.");
-            cloudServer.stop();
-        });
+        owner.getServers().stream().filter(cloudServer -> cloudServer.getName().equals(e.getFrom().getName())).findFirst().ifPresent(CloudServer::remove);
+    }
+
+    @EventHandler
+    public void onShutdown(ProxiedServerRemoveEvent e) {
+        CloudServer.getCloudServers().stream().filter(cloudServer -> cloudServer.getName().equals(e.getServerInfo().getServiceId().getServerId())).findFirst().ifPresent(CloudServer::remove);
     }
 
 }

src/main/java/de/luuuuuis/privateserver/bungee/util/CloudServer.java

@@ -58,7 +58,18 @@ public void start() {
         owner.sendTitle(this);
     }
 
-    public void stop() {
+    private void stop() {
+        if (CloudAPI.getInstance().getServerInfo(name) != null) {
+            getPlayers().forEach(player -> {
+                ProxiedPlayer proxiedPlayer = ProxyServer.getInstance().getPlayer(player);
+                proxiedPlayer.sendMessage(TextComponent.fromLegacyText(Config.getInstance().getPrefix() + "The server you were on was shutdown. You were moved to the fallback server."));
+            });
+
+            CloudAPI.getInstance().stopServer(name);
+        }
+    }
+
+    public void remove() {
         owner.sendMessage(Config.getInstance().getPrefix() + "Stopping " + name + "...");
 
         // remove from Invitee list
@@ -67,16 +78,9 @@ public void stop() {
                 .collect(Collectors.toList())
                 .forEach(Invitee::revoke);
 
-        CloudAPI.getInstance().stopServer(name);
+        stop();
         cloudServers.remove(this);
         owner.removeServer(this);
-
-        getPlayers().forEach(player -> {
-            ProxiedPlayer proxiedPlayer = ProxyServer.getInstance().getPlayer(player);
-            proxiedPlayer.sendMessage(TextComponent.fromLegacyText(Config.getInstance().getPrefix() + "The server you were on was shutdown. You were moved to the fallback server."));
-        });
-
-
     }
 
     private boolean isAllowed() {
@@ -105,16 +109,20 @@ private boolean isAllowed() {
     }
 
     private String createName() {
-        name = "PV-" + new Random().nextInt(1000);
+        name = "PV-" + rndInt();
 
         //check if already there
         while (cloudServers.stream().anyMatch(server -> server.name.equals(name))) {
-            name = "PV-" + new Random().nextInt(1000);
+            name = "PV-" + rndInt();
         }
 
         return name;
     }
 
+    private int rndInt() {
+        return new Random().nextInt(1000 - 1) + 1;
+    }
+
     public List<String> getPlayers() {
         return CloudAPI.getInstance().getServerInfo(name).getPlayers();
     }

src/main/java/de/luuuuuis/privateserver/bungee/util/Invitee.java

@@ -46,7 +46,7 @@ public void sendInvitation() {
         serverHover.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new Text("§a§l" + cloudServer.getName())));
 
         player.sendMessage(new ComponentBuilder(Config.getInstance().getPrefix() + owner.getPlayer().getDisplayName() + " §7invited you to join him playing a private round of ")
-                .append(serverHover).append("§7.\n")
+                .append(serverHover).append("§7.\n", ComponentBuilder.FormatRetention.NONE)
                 .append(Config.getInstance().getPrefix() + "Click here to join: ")
                 .append(joinClick).create());