From 0146ce1f4163f8083c0809fb799dc1f5afbe0c3c Mon Sep 17 00:00:00 2001 From: BuildTools Date: Sat, 2 Mar 2019 23:13:58 -0500 Subject: [PATCH] Fix particles for 1.8, fixes #718 --- .../me/blackvein/quests/particle/ParticleProvider.java | 7 ++++--- .../quests/{nms/v1_8_R1 => }/particle/Eff_1_8_R1.java | 0 .../ParticleProvider_v1_8_R2.java} | 0 .../ParticleProvider_v1_8_R3.java} | 0 4 files changed, 4 insertions(+), 3 deletions(-) rename v1_8_R1/src/main/java/me/blackvein/quests/{nms/v1_8_R1 => }/particle/Eff_1_8_R1.java (100%) rename v1_8_R2/src/main/java/me/blackvein/quests/{nms/v1_8_R2/particle/Eff_1_8_R2.java => particle/ParticleProvider_v1_8_R2.java} (100%) rename v1_8_R3/src/main/java/me/blackvein/quests/{nms/v1_8_R3/particle/Eff_1_8_R3.java => particle/ParticleProvider_v1_8_R3.java} (100%) diff --git a/main/src/main/java/me/blackvein/quests/particle/ParticleProvider.java b/main/src/main/java/me/blackvein/quests/particle/ParticleProvider.java index 9a637ccf2..f58d633e7 100644 --- a/main/src/main/java/me/blackvein/quests/particle/ParticleProvider.java +++ b/main/src/main/java/me/blackvein/quests/particle/ParticleProvider.java @@ -27,7 +27,7 @@ public abstract class ParticleProvider { String packageName = ParticleProvider.class.getPackage().getName(); String internalsName = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3]; if (internalsName.startsWith("v1_8_R")) { - loaded = (ParticleProvider) Class.forName(packageName + "." + internalsName).newInstance(); + loaded = (ParticleProvider) Class.forName(packageName + ".ParticleProvider_" + internalsName).newInstance(); } else { loaded = new ParticleProvider_Bukkit(); } @@ -121,7 +121,8 @@ public abstract class ParticleProvider { if (particle.getVector() != null) { pos.add(particle.getVector()); } - loaded.spawnParticle(player, pos, loaded.getParticleMap().get(particle), particle.getOffsetX(), particle.getOffsetY(), particle.getOffsetZ(), particle.getSpeed(), particle.getCount(), null); + loaded.spawnParticle(player, pos, + loaded.getParticleMap().get(particle), + particle.getOffsetX(), particle.getOffsetY(), particle.getOffsetZ(), particle.getSpeed(), particle.getCount(), null); } - } \ No newline at end of file diff --git a/v1_8_R1/src/main/java/me/blackvein/quests/nms/v1_8_R1/particle/Eff_1_8_R1.java b/v1_8_R1/src/main/java/me/blackvein/quests/particle/Eff_1_8_R1.java similarity index 100% rename from v1_8_R1/src/main/java/me/blackvein/quests/nms/v1_8_R1/particle/Eff_1_8_R1.java rename to v1_8_R1/src/main/java/me/blackvein/quests/particle/Eff_1_8_R1.java diff --git a/v1_8_R2/src/main/java/me/blackvein/quests/nms/v1_8_R2/particle/Eff_1_8_R2.java b/v1_8_R2/src/main/java/me/blackvein/quests/particle/ParticleProvider_v1_8_R2.java similarity index 100% rename from v1_8_R2/src/main/java/me/blackvein/quests/nms/v1_8_R2/particle/Eff_1_8_R2.java rename to v1_8_R2/src/main/java/me/blackvein/quests/particle/ParticleProvider_v1_8_R2.java diff --git a/v1_8_R3/src/main/java/me/blackvein/quests/nms/v1_8_R3/particle/Eff_1_8_R3.java b/v1_8_R3/src/main/java/me/blackvein/quests/particle/ParticleProvider_v1_8_R3.java similarity index 100% rename from v1_8_R3/src/main/java/me/blackvein/quests/nms/v1_8_R3/particle/Eff_1_8_R3.java rename to v1_8_R3/src/main/java/me/blackvein/quests/particle/ParticleProvider_v1_8_R3.java