improvements

Author: WaterArchery

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>me.waterarchery</groupId>
     <artifactId>LitLibs</artifactId>
-    <version>1.1.31</version>
+    <version>1.1.32</version>
     <packaging>jar</packaging>
 
     <name>LitLibs</name>

src/main/java/me/waterarchery/litlibs/LitLibsPlugin.java

@@ -5,6 +5,7 @@
 import io.github.retrooper.packetevents.factory.spigot.SpigotPacketEventsBuilder;
 import lombok.Getter;
 import me.waterarchery.litlibs.listeners.ChunkListeners;
+import me.waterarchery.litlibs.listeners.JoinLeaveListeners;
 import me.waterarchery.litlibs.listeners.PacketListeners;
 import me.waterarchery.litlibs.listeners.PluginDisabledListener;
 import me.waterarchery.litlibs.logger.LogSeverity;
@@ -54,6 +55,7 @@ public void onEnable() {
 
         getServer().getPluginManager().registerEvents(new PluginDisabledListener(), this);
         getServer().getPluginManager().registerEvents(new ChunkListeners(), this);
+        getServer().getPluginManager().registerEvents(new JoinLeaveListeners(), this);
     }
 
     @Override

src/main/java/me/waterarchery/litlibs/handlers/SoundHandler.java

@@ -3,9 +3,6 @@
 import com.cryptomorin.xseries.XSound;
 import me.waterarchery.litlibs.LitLibs;
 import me.waterarchery.litlibs.configuration.ConfigManager;
-import me.waterarchery.litlibs.logger.LogSeverity;
-import me.waterarchery.litlibs.logger.Logger;
-import org.bukkit.Sound;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
@@ -30,15 +27,14 @@ public void sendSound(Player p, String configPath, double volume) {
     }
 
     public void sendRawSound(Player p, String soundName, double volume, double pitch) {
-        XSound xSound = XSound.valueOf(soundName);
-        Sound sound = xSound.parseSound();
+        try {
+            XSound xSound = XSound.valueOf(soundName);
 
-        if (sound != null) {
-            p.playSound(p.getLocation(), sound, (float) volume, (float) pitch);
+            xSound.play(p, (float) volume, (float) pitch);
         }
-        else {
-            Logger logger = litLibs.getLogger();
-            logger.log("Error in sound : " + soundName, LogSeverity.ERROR);
+        catch (IllegalArgumentException e) {
+            litLibs.getLogger().error("Error sound playing: " + soundName);
+            e.printStackTrace();
         }
     }
 

src/main/java/me/waterarchery/litlibs/impl/npc/NPC.java

@@ -92,7 +92,7 @@ public void spawn(Player player) {
 
         queuePacket(spawnPacket, player);
 
-        Bukkit.getScheduler().scheduleSyncDelayedTask(LitLibsPlugin.getInstance(), this::update, 5);
+        Bukkit.getScheduler().scheduleSyncDelayedTask(LitLibsPlugin.getInstance(), this::update, 1);
     }
 
     public void update() {
@@ -166,12 +166,10 @@ public void setGlowingColor(ChatColor color) {
     }
 
     public void queuePacketSeeing(PacketWrapper<?> packet) {
-        Runnable runnable = () -> {
-            Bukkit.getOnlinePlayers().forEach(player -> {
-                UUID playerUUID = player.getUniqueId();
-                if (seeingPlayers.contains(playerUUID)) queuePacket(packet, player);
-            });
-        };
+        Runnable runnable = () -> Bukkit.getOnlinePlayers().forEach(player -> {
+            UUID playerUUID = player.getUniqueId();
+            if (seeingPlayers.contains(playerUUID)) queuePacket(packet, player);
+        });
 
         npcHandler.getExecutor().submit(runnable);
     }

src/main/java/me/waterarchery/litlibs/listeners/ChunkListeners.java

@@ -38,6 +38,7 @@ public void onNpcLoad(ChunkLoadEvent event) {
                 continue;
             }
 
+            if (!npc.isDespawned()) continue;
             if (world.equalsIgnoreCase(npc.getWorldName()) && npc.getChunkX() == x && npc.getChunkZ() == z) npc.setDespawned(false);
         }
 

src/main/java/me/waterarchery/litlibs/listeners/JoinLeaveListeners.java

@@ -0,0 +1,29 @@
+package me.waterarchery.litlibs.listeners;
+
+import me.waterarchery.litlibs.handlers.NPCHandler;
+import me.waterarchery.litlibs.impl.npc.NPC;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerQuitEvent;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class JoinLeaveListeners implements Listener {
+
+    @EventHandler (ignoreCancelled = true, priority = EventPriority.HIGHEST)
+    public void onPlayerLeave(PlayerQuitEvent event) {
+        NPCHandler npcHandler = NPCHandler.getInstance();
+        Player player = event.getPlayer();
+
+        List<NPC> clone = new ArrayList<>(npcHandler.getNpcs());
+        clone.forEach(npc -> {
+            if (npc == null) return;
+
+            npc.getSeeingPlayers().remove(player.getUniqueId());
+        });
+    }
+
+}

src/main/java/me/waterarchery/litlibs/listeners/PacketListeners.java

@@ -6,6 +6,7 @@
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientInteractEntity;
 import me.waterarchery.litlibs.LitLibsPlugin;
 import me.waterarchery.litlibs.handlers.NPCHandler;
+import me.waterarchery.litlibs.impl.npc.NPC;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
@@ -32,7 +33,8 @@ public void onPacketReceive(PacketReceiveEvent event) {
             recentlyClicked.add(player.getUniqueId());
             Bukkit.getScheduler().runTaskLater(LitLibsPlugin.getInstance(), () -> recentlyClicked.remove(player.getUniqueId()), 5);
 
-            npcHandler.getNpcs().stream()
+            List<NPC> clone = new ArrayList<>(npcHandler.getNpcs());
+            clone.stream()
                     .filter(Objects::nonNull)
                     .filter(npc -> npc.getEntityId() == entityId)
                     .forEach(npc -> npc.execute(player));