From 9de5dfbda32f44c72f86bdac6be9d6bee6ce3f6a Mon Sep 17 00:00:00 2001
From: Esophose <esophose@gmail.com>
Date: Fri, 28 Feb 2020 18:24:50 -0700
Subject: [PATCH] v7.4, fix fixed celebration w/ vanish, fixed create args, &
 fixed tp

---
 build.gradle                                       |  2 +-
 settings.gradle                                    |  2 +-
 .../command/FixedCommandModule.java                | 14 +++++++++++---
 .../playerparticles/manager/ParticleManager.java   |  2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 2374551..0f1dea5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ sourceCompatibility = 1.8
 targetCompatibility = 1.8
 compileJava.options.encoding = 'UTF-8'
 group = 'dev.esophose'
-version = '7.3'
+version = '7.4'
 
 java {
     withJavadocJar()
diff --git a/settings.gradle b/settings.gradle
index 658f7bc..70fcc0f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-rootProject.name = 'playerparticles'
+rootProject.name = 'PlayerParticles'
diff --git a/src/main/java/dev/esophose/playerparticles/command/FixedCommandModule.java b/src/main/java/dev/esophose/playerparticles/command/FixedCommandModule.java
index e433c8a..4a190a0 100644
--- a/src/main/java/dev/esophose/playerparticles/command/FixedCommandModule.java
+++ b/src/main/java/dev/esophose/playerparticles/command/FixedCommandModule.java
@@ -117,14 +117,22 @@ public class FixedCommandModule implements CommandModule {
             return;
         }
 
+        boolean isLooking = args.length > 0 && args[0].equalsIgnoreCase("looking");
+
         int argAmount;
         if (player != null) {
             argAmount = 5;
         } else {
             argAmount = 6;
         }
-        if (args.length < argAmount && !(args.length > 0 && args[0].equalsIgnoreCase("looking") && args.length >= 3)) {
-            localeManager.sendMessage(pplayer, "fixed-create-missing-args", StringPlaceholders.single("amount", argAmount - args.length));
+        if ((isLooking && args.length < argAmount - 2) || (!isLooking && args.length < argAmount)) {
+            String amount;
+            if (args.length == 0) {
+                amount = "3-5";
+            } else {
+                amount = String.valueOf((isLooking ? argAmount - 2 : argAmount) - args.length);
+            }
+            localeManager.sendMessage(pplayer, "fixed-create-missing-args", StringPlaceholders.single("amount", amount));
             return;
         }
 
@@ -543,7 +551,7 @@ public class FixedCommandModule implements CommandModule {
             return;
         }
 
-        player.teleport(fixedEffect.getLocation());
+        Bukkit.getScheduler().runTask(PlayerParticles.getInstance(), () -> player.teleport(fixedEffect.getLocation()));
         localeManager.sendMessage(pplayer, "fixed-teleport-success", StringPlaceholders.single("id", id));
     }
 
diff --git a/src/main/java/dev/esophose/playerparticles/manager/ParticleManager.java b/src/main/java/dev/esophose/playerparticles/manager/ParticleManager.java
index 6474b59..a5dfb16 100644
--- a/src/main/java/dev/esophose/playerparticles/manager/ParticleManager.java
+++ b/src/main/java/dev/esophose/playerparticles/manager/ParticleManager.java
@@ -200,7 +200,7 @@ public class ParticleManager extends Manager implements Listener, Runnable {
             return;
 
         for (PParticle pparticle : particles)
-            ParticleEffect.display(particle, pparticle, isLongRange, Bukkit.getPlayer(particle.getOwnerUniqueId()));
+            ParticleEffect.display(particle, pparticle, isLongRange, player);
     }
 
     /**