diff --git a/src/main/java/com/alttd/gui/actions/ActivateParticleSet.java b/src/main/java/com/alttd/gui/actions/ActivateParticleSet.java
index 6ddb13c..c40e9f7 100644
--- a/src/main/java/com/alttd/gui/actions/ActivateParticleSet.java
+++ b/src/main/java/com/alttd/gui/actions/ActivateParticleSet.java
@@ -39,7 +39,7 @@ public class ActivateParticleSet implements GUIAction {
         else
             playerSettings.removeParticle(particleSet.getAPartType());
         if (enable && !particleSet.getAPartType().hasEvent() && playerSettings.hasActiveParticles())
-            particleSet.run(player, playerSettings, player.getUniqueId());
+            particleSet.run(player, playerSettings);
     }
 
     private boolean updateItem(@NotNull ItemStack itemStack, Player player) {
diff --git a/src/main/java/com/alttd/listeners/BlockBreakListener.java b/src/main/java/com/alttd/listeners/BlockBreakListener.java
index 7b9960f..102971d 100644
--- a/src/main/java/com/alttd/listeners/BlockBreakListener.java
+++ b/src/main/java/com/alttd/listeners/BlockBreakListener.java
@@ -39,7 +39,7 @@ public class BlockBreakListener implements Listener {
                     ParticleSet particleSet = playerSettings.getParticles(aPartType);
                     if (particleSet == null)
                         return;
-                    particleSet.run(event.getBlock().getLocation(), uuid);
+                    particleSet.run(event.getBlock().getLocation(), player);
                 });
             }
         }.runTaskAsynchronously(AltitudeParticles.getInstance());
diff --git a/src/main/java/com/alttd/listeners/BlockPlaceListener.java b/src/main/java/com/alttd/listeners/BlockPlaceListener.java
index 46bf1aa..d752737 100644
--- a/src/main/java/com/alttd/listeners/BlockPlaceListener.java
+++ b/src/main/java/com/alttd/listeners/BlockPlaceListener.java
@@ -39,7 +39,7 @@ public class BlockPlaceListener implements Listener {
                     ParticleSet particleSet = playerSettings.getParticles(aPartType);
                     if (particleSet == null)
                         return;
-                    particleSet.run(event.getBlock().getLocation(), uuid);
+                    particleSet.run(event.getBlock().getLocation(), player);
                 });
             }
         }.runTaskAsynchronously(AltitudeParticles.getInstance());
diff --git a/src/main/java/com/alttd/listeners/DeathListener.java b/src/main/java/com/alttd/listeners/DeathListener.java
index 0383f23..911b455 100644
--- a/src/main/java/com/alttd/listeners/DeathListener.java
+++ b/src/main/java/com/alttd/listeners/DeathListener.java
@@ -38,7 +38,7 @@ public class DeathListener implements Listener {
                     ParticleSet particleSet = playerSettings.getParticles(aPartType);
                     if (particleSet == null)
                         return;
-                    particleSet.run(player.getLocation(), uuid);
+                    particleSet.run(player.getLocation(), player);
                 });
             }
         }.runTaskAsynchronously(AltitudeParticles.getInstance());
diff --git a/src/main/java/com/alttd/listeners/KillListener.java b/src/main/java/com/alttd/listeners/KillListener.java
index 6bc7a35..28c48bc 100644
--- a/src/main/java/com/alttd/listeners/KillListener.java
+++ b/src/main/java/com/alttd/listeners/KillListener.java
@@ -40,7 +40,7 @@ public class KillListener implements Listener {
                     ParticleSet particleSet = playerSettings.getParticles(aPartType);
                     if (particleSet == null)
                         return;
-                    particleSet.run(event.getEntity().getLocation(), uuid);
+                    particleSet.run(event.getEntity().getLocation(), player);
                 });
             }
         }.runTaskAsynchronously(AltitudeParticles.getInstance());
diff --git a/src/main/java/com/alttd/listeners/PlayerJoinListener.java b/src/main/java/com/alttd/listeners/PlayerJoinListener.java
index ba91f43..4da2e06 100644
--- a/src/main/java/com/alttd/listeners/PlayerJoinListener.java
+++ b/src/main/java/com/alttd/listeners/PlayerJoinListener.java
@@ -43,7 +43,7 @@ public class PlayerJoinListener implements Listener {
                     ParticleSet particleSet = finalPlayerSettings.getParticles(aPartType);
                     if (particleSet == null)
                         return;
-                    particleSet.run(player, finalPlayerSettings, uuid);
+                    particleSet.run(player, finalPlayerSettings);
                 });
             }
         }.runTaskAsynchronously(AltitudeParticles.getInstance());
diff --git a/src/main/java/com/alttd/listeners/RightClickListener.java b/src/main/java/com/alttd/listeners/RightClickListener.java
index 82e1a21..a1d8527 100644
--- a/src/main/java/com/alttd/listeners/RightClickListener.java
+++ b/src/main/java/com/alttd/listeners/RightClickListener.java
@@ -51,7 +51,7 @@ public class RightClickListener implements Listener {
                     ParticleSet particleSet = playerSettings.getParticles(aPartType);
                     if (particleSet == null)
                         return;
-                    particleSet.run(player.getLocation(), uuid);
+                    particleSet.run(player.getLocation(), player);
                 });
             }
         }.runTaskAsynchronously(AltitudeParticles.getInstance());
diff --git a/src/main/java/com/alttd/listeners/TeleportArriveListener.java b/src/main/java/com/alttd/listeners/TeleportArriveListener.java
index 36b6f3d..028a625 100644
--- a/src/main/java/com/alttd/listeners/TeleportArriveListener.java
+++ b/src/main/java/com/alttd/listeners/TeleportArriveListener.java
@@ -38,7 +38,7 @@ public class TeleportArriveListener implements Listener {
                     ParticleSet particleSet = playerSettings.getParticles(aPartType);
                     if (particleSet == null)
                         return;
-                    particleSet.run(event.getTo(), uuid);
+                    particleSet.run(event.getTo(), player);
                 });
             }
         }.runTaskAsynchronously(AltitudeParticles.getInstance());