v7.4, fix fixed celebration w/ vanish, fixed create args, & fixed tp

This commit is contained in:
Esophose 2020-02-28 18:24:50 -07:00
parent c8579b41b6
commit 9de5dfbda3
4 changed files with 14 additions and 6 deletions

View file

@ -10,7 +10,7 @@ sourceCompatibility = 1.8
targetCompatibility = 1.8 targetCompatibility = 1.8
compileJava.options.encoding = 'UTF-8' compileJava.options.encoding = 'UTF-8'
group = 'dev.esophose' group = 'dev.esophose'
version = '7.3' version = '7.4'
java { java {
withJavadocJar() withJavadocJar()

View file

@ -1 +1 @@
rootProject.name = 'playerparticles' rootProject.name = 'PlayerParticles'

View file

@ -117,14 +117,22 @@ public class FixedCommandModule implements CommandModule {
return; return;
} }
boolean isLooking = args.length > 0 && args[0].equalsIgnoreCase("looking");
int argAmount; int argAmount;
if (player != null) { if (player != null) {
argAmount = 5; argAmount = 5;
} else { } else {
argAmount = 6; argAmount = 6;
} }
if (args.length < argAmount && !(args.length > 0 && args[0].equalsIgnoreCase("looking") && args.length >= 3)) { if ((isLooking && args.length < argAmount - 2) || (!isLooking && args.length < argAmount)) {
localeManager.sendMessage(pplayer, "fixed-create-missing-args", StringPlaceholders.single("amount", argAmount - args.length)); 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; return;
} }
@ -543,7 +551,7 @@ public class FixedCommandModule implements CommandModule {
return; return;
} }
player.teleport(fixedEffect.getLocation()); Bukkit.getScheduler().runTask(PlayerParticles.getInstance(), () -> player.teleport(fixedEffect.getLocation()));
localeManager.sendMessage(pplayer, "fixed-teleport-success", StringPlaceholders.single("id", id)); localeManager.sendMessage(pplayer, "fixed-teleport-success", StringPlaceholders.single("id", id));
} }

View file

@ -200,7 +200,7 @@ public class ParticleManager extends Manager implements Listener, Runnable {
return; return;
for (PParticle pparticle : particles) for (PParticle pparticle : particles)
ParticleEffect.display(particle, pparticle, isLongRange, Bukkit.getPlayer(particle.getOwnerUniqueId())); ParticleEffect.display(particle, pparticle, isLongRange, player);
} }
/** /**