fix double Instance Server class and system clean on class Entity and…

… SculkServerSession for remove player on list only player

src/main/java/org/sculk/Sculk.java

@@ -4,6 +4,7 @@
 import lombok.extern.log4j.Log4j2;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.sculk.config.ServerProperties;
 import org.sculk.lang.LanguageKeys;
 import org.sculk.lang.LocalManager;
 import org.sculk.network.protocol.ProtocolInfo;
@@ -12,6 +13,7 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.nio.file.Path;
 import java.util.List;
 import java.util.Properties;
 
@@ -46,34 +48,22 @@ public class Sculk {
     private static final String LOG_LANGUAGE_NOT_FOUND = "Language code {} not found, defaulting to en_GB";
 
     public static void main(String[] args) {
-        Thread.currentThread().setName("sculkmp-main");
-        System.setProperty("log4j.skipJansi", "false");
-        Logger log = LogManager.getLogger(Sculk.class);
-
-        LocalManager localManager = new LocalManager(Sculk.class.getClassLoader(), "language");
-        try {
-            Properties properties = loadServerProperties();
-            String langCode = properties.getProperty("language", LANGUAGE_DEFAULT);
-
-            var language = localManager.getLanguage(langCode);
-            if (language == null) {
-                log.warn(LOG_LANGUAGE_NOT_FOUND, langCode);
-                language = localManager.getLanguage(LANGUAGE_DEFAULT);
-            }
-
-            new Server(localManager, log, DATA_PATH);
-        } catch (Exception e) {
-            log.throwing(e);
-            shutdown();
-        }
-
         int javaVersion = getJavaVersion();
         if (javaVersion < 21) {
             log.error(LOG_UNSUPPORTED_JAVA, TextFormat.RED, javaVersion);
             LogManager.shutdown();
             return;
         }
+        Thread.currentThread().setName("sculkmp-main");
+        System.setProperty("log4j.skipJansi", "false");
 
+        Logger log = LogManager.getLogger(Sculk.class);
+
+        LocalManager localManager = new LocalManager(Sculk.class.getClassLoader(), "language");
+        if (!(new File(DATA_PATH + "server.properties").exists())) {
+
+            new ServerProperties(Path.of(DATA_PATH));
+        }
         try {
             new Server(localManager, log, DATA_PATH);
         } catch (Exception e) {

src/main/java/org/sculk/Server.java

@@ -199,10 +199,10 @@ public void start() {
     }
 
     public void shutdown() {
-        Map<UUID, Player> onlinePlayers = this.getOnlinePlayers();
         if (this.shutdown) {
             return;
         }
+        Map<UUID, Player> onlinePlayers = this.getOnlinePlayers();
         for (Map.Entry<UUID, Player> entry : onlinePlayers.entrySet()) {
             Player player = entry.getValue();
             player.getNetworkSession().disconnect(SERVER_CLOSED_MESSAGE);
@@ -225,6 +225,7 @@ public void shutdown() {
         this.console.getConsoleThread().interrupt();
 
         this.logger.info(this.language.translate(LanguageKeys.SCULK_THREADS_STOPPING));
+        System.exit(0);
     }
 
     public CompletableFuture<Player> createPlayer(SculkServerSession session, ClientChainData info, boolean authenticated) {

src/main/java/org/sculk/entity/Entity.java

@@ -22,7 +22,11 @@
 import org.sculk.player.Player;
 
 import javax.annotation.Nullable;
+import java.lang.ref.Cleaner;
+import java.lang.ref.WeakReference;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 /*
  *   ____             _ _
@@ -39,7 +43,7 @@
  * @author: SculkTeams
  * @link: http://www.sculkmp.org/
  */
-public abstract class Entity {
+public abstract class Entity implements Cleaner.Cleanable {
 
     private static long nextEntityId = 1;
 
@@ -50,7 +54,7 @@ public static long getNextEntityId() {
 
     public abstract String getNetworkTypeId();
 
-    protected List<Player> hasSpawned;
+    protected Set<Player> hasSpawned;
     @Getter
     private long entityId;
     protected Server server;
@@ -109,7 +113,7 @@ public Entity() {
         networkPropertiesDirty = true;
         this.size = this.getInitialSizeInfo();
         this.ownerId = null;
-        this.hasSpawned = new ObjectArrayList<Player>();
+        this.hasSpawned = new HashSet<>();
         this.initEntity(NbtMap.EMPTY);
     }
     public Entity(NbtMap nbt) {
@@ -122,7 +126,7 @@ public Entity(NbtMap nbt) {
         networkPropertiesDirty = true;
         this.size = this.getInitialSizeInfo();
         this.ownerId = null;
-        this.hasSpawned = new ObjectArrayList<Player>();
+        this.hasSpawned = new HashSet<>();
         this.initEntity(nbt);
     }
 
@@ -203,7 +207,7 @@ public boolean onUpdate(long currentTick) {
         return (hasUpdate);
     }
 
-    public List<Player> getViewers()
+    public Set<Player> getViewers()
     {
         return this.hasSpawned;
     }
@@ -303,7 +307,7 @@ public void spawnTo(Player player) {
     }
 
     public void respawnToAll() {
-        List<Player> players = this.getViewers();
+        Set<Player> players = this.getViewers();
         this.hasSpawned.clear();
         for (Player player : players) {
             this.spawnTo(player);
@@ -370,4 +374,9 @@ public void sendData(EntityDataMap data) {
         //TODO: add system viewer
         NetworkBroadcastUtils.broadcastEntityEvent(List.of(), (EntityEventBroadcaster broadcaster, List<SculkServerSession> recipients) -> broadcaster.syncActorData(recipients, this, data));
     }
+
+    @Override
+    public void clean() {
+        this.despawnFromAll();
+    }
 }

src/main/java/org/sculk/network/BedrockInterface.java

@@ -181,7 +181,7 @@ public void setName(String name) {
                 .ipv4Port(19132)
                 .ipv6Port(19132);
 
-        for (Channel channel : this.serverChannels) {
+        for (RakServerChannel channel : this.serverChannels) {
             channel.config().setOption(RakChannelOption.RAK_ADVERTISEMENT, this.bedrockPong.toByteBuf());
         }
     }
@@ -193,8 +193,8 @@ public boolean process() {
 
     @Override
     public void shutdown() {
-        for(Channel channel : this.serverChannels) {
-            channel.closeFuture().awaitUninterruptibly();
+        for(RakServerChannel channel : this.serverChannels) {
+            channel.close();
         }
     }
 

src/main/java/org/sculk/network/broadcaster/StandardEntityEventBroadcaster.java

@@ -2,6 +2,7 @@
 
 import org.cloudburstmc.protocol.bedrock.data.entity.EntityDataMap;
 import org.cloudburstmc.protocol.bedrock.packet.BedrockPacket;
+import org.cloudburstmc.protocol.bedrock.packet.RemoveEntityPacket;
 import org.cloudburstmc.protocol.bedrock.packet.SetEntityDataPacket;
 import org.sculk.entity.Attribute;
 import org.sculk.entity.Entity;
@@ -39,7 +40,9 @@ public void syncActorData(List<SculkServerSession> recipients, Entity entity, En
 
     public void onEntityRemoved(List<SculkServerSession> recipients, Entity entity)
     {
-        //TODO
+       RemoveEntityPacket packet = new RemoveEntityPacket();
+       packet.setUniqueEntityId(entity.getEntityId());
+       this.sendDataPacket(recipients, packet);
     }
 
 

src/main/java/org/sculk/network/session/SculkPeer.java

@@ -3,6 +3,7 @@
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
 import org.cloudburstmc.protocol.bedrock.BedrockPeer;
+import org.cloudburstmc.protocol.bedrock.BedrockSession;
 import org.cloudburstmc.protocol.bedrock.BedrockSessionFactory;
 import org.cloudburstmc.protocol.bedrock.netty.BedrockPacketWrapper;
 import org.cloudburstmc.protocol.bedrock.packet.BedrockPacket;
@@ -15,6 +16,15 @@ public class SculkPeer extends BedrockPeer {
     public SculkPeer(Channel channel, BedrockSessionFactory sessionFactory) {
         super(channel, sessionFactory);
     }
+
+    @Override
+    protected void removeSession(BedrockSession session) {
+        super.removeSession(session);
+        if (session instanceof SculkServerSession sculkServerSession) {
+            sculkServerSession.clean();
+        }
+    }
+
     public void sendPacket(int senderClientId, int targetClientId, List<BedrockPacket> packets) {
         packets.forEach(packet -> {
             super.sendPacket(senderClientId, targetClientId, packet);

src/main/java/org/sculk/network/session/SculkServerSession.java

@@ -20,6 +20,7 @@
 import org.sculk.utils.SkinUtils;
 
 import javax.annotation.Nullable;
+import java.lang.ref.Cleaner;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -41,7 +42,7 @@
  * @link: http://www.sculkmp.org/
  */
 @Getter
-public class SculkServerSession extends BedrockServerSession {
+public class SculkServerSession extends BedrockServerSession implements Cleaner.Cleanable {
 
     private final Server server;
     private final BedrockInterface bedrockInterface;
@@ -185,6 +186,7 @@ public void onPlayerAdded(Player p){
     public void onPlayerRemoved(Player p) {
         if(!p.equals(this.player)){
             PlayerListPacket packet = new PlayerListPacket();
+            packet.setAction(PlayerListPacket.Action.REMOVE);
             packet.getEntries().add(this.createPlayerEntry(p, false));
             this.sendPacket(packet);
         }
@@ -302,4 +304,12 @@ public void onMessageSystem(String message) {
         packet.setMessage(message);
         this.sendPacket(packet);
     }
+
+    @Override
+    public void clean() {
+        if (this.player != null) {
+            this.player.clean();
+            this.player = null;
+        }
+    }
 }

src/main/java/org/sculk/network/utils/NetworkBroadcastUtils.java

@@ -6,10 +6,7 @@
 import org.sculk.network.session.SculkServerSession;
 import org.sculk.player.Player;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.function.BiConsumer;
 
 public class NetworkBroadcastUtils {
@@ -38,6 +35,24 @@ public static void broadcastEntityEvent(List<Player> recipients, BiConsumer<Enti
         broadcasterTargets.forEach(callback);
     }
 
+    public static void broadcastEntityEvent(Set<Player> recipients, BiConsumer<EntityEventBroadcaster, List<SculkServerSession>> callback) {
+        // Group broadcasters and their associated sessions
+        Map<EntityEventBroadcaster, List<SculkServerSession>> broadcasterTargets = new HashMap<>();
+
+        for (Player recipient : recipients) {
+            SculkServerSession session = recipient.getNetworkSession();
+            EntityEventBroadcaster broadcaster = session.getEntityEventBroadcaster();
+
+            // Group sessions by broadcaster
+            broadcasterTargets
+                    .computeIfAbsent(broadcaster, k -> new ArrayList<>())
+                    .add(session);
+        }
+
+        // Invoke callback for each unique broadcaster
+        broadcasterTargets.forEach(callback);
+    }
+
 
     public static void broadcastPackets(List<Player> recipients, List<BedrockPacket> packets) {
         // Group broadcasters and their associated sessions
@@ -58,4 +73,24 @@ public static void broadcastPackets(List<Player> recipients, List<BedrockPacket>
             broadcaster.broadcastPackets(sculkServerSessions, packets);
         });
     }
+
+    public static void broadcastPackets(Set<Player> recipients, List<BedrockPacket> packets) {
+        // Group broadcasters and their associated sessions
+        Map<PacketBroadcaster, List<SculkServerSession>> broadcasterTargets = new HashMap<>();
+
+        for (Player recipient : recipients) {
+            SculkServerSession session = recipient.getNetworkSession();
+            PacketBroadcaster broadcaster = session.getBroadcaster();
+
+            // Group sessions by broadcaster
+            broadcasterTargets
+                    .computeIfAbsent(broadcaster, k -> new ArrayList<>())
+                    .add(session);
+        }
+
+        // Invoke callback for each unique broadcaster
+        broadcasterTargets.forEach((broadcaster, sculkServerSessions) -> {
+            broadcaster.broadcastPackets(sculkServerSessions, packets);
+        });
+    }
 }

src/main/java/org/sculk/player/Player.java

@@ -297,7 +297,7 @@ public boolean onUpdate(long currentTick) {
 
     @Override
     public void spawnTo(@NonNull Player player) {
-        if (this.isAlive() && player.isAlive()) {
+        if (this.isAlive() && player.isAlive() && this.canSee(player)) {
             super.spawnTo(player);
         }
     }
@@ -390,4 +390,10 @@ public void sendWhisper(RawTextBuilder rawTextBuilder) {
     public void sendMessageTranslation(String translate, List<String> parameters) {
         this.getNetworkSession().onMessageTranslation(translate, parameters);
     }
+
+    @Override
+    public void clean() {
+        this.getServer().removeOnlinePlayer(this);
+        super.clean();
+    }
 }