Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-11-21 18:15:32 +01:00
Code Issues Projects Releases Wiki Activity

Only get package name for 1.8 versions

Browse Source
This commit is contained in:
PikaMug 2024-05-19 00:53:18 -04:00
parent 15044ba9e2
commit 37316238e2
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/main/java/me/pikamug/quests/convo/misc/NpcOfferQuestPrompt.java
View File

@ -77,7 +77,6 @@ public class NpcOfferQuestPrompt extends MiscStringPrompt {
return ChatColor.GOLD;
}
} else if (number == (quests.size() + 1)) {
//return ChatColor.RED;
return ChatColor.GOLD;
}
}

21
core/src/main/java/me/pikamug/quests/nms/BukkitParticleProvider.java
View File

@ -23,19 +23,20 @@ public abstract class BukkitParticleProvider {
private static BukkitParticleProvider loaded;
static {
final String internalsName = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
final String bukkitVersion = Bukkit.getServer().getBukkitVersion().split("-")[0];
try {
final String packageName = BukkitParticleProvider.class.getPackage().getName();
if (internalsName.startsWith("v1_8_R")) {
loaded = (BukkitParticleProvider) Class.forName(packageName + ".BukkitParticleProvider_" + internalsName)
.newInstance();
if (bukkitVersion.startsWith("1.8.")) {
final String internalsName = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
loaded = (BukkitParticleProvider) Class.forName(packageName + ".BukkitParticleProvider_"
+ internalsName).newInstance();
} else {
// Should not be an issue because single thread, alternatives welcome!
// Referencing subclass should not be an issue because single thread, alternatives welcome!
loaded = new BukkitParticleProvider_Modern();
}
} catch (final ClassNotFoundException | InstantiationException | IllegalAccessException
| ClassCastException exception) {
Bukkit.getLogger().severe("[Quests] No valid particle implementation for version " + internalsName);
Bukkit.getLogger().severe("[Quests] No valid particle implementation for version " + bukkitVersion);
}
}
@ -68,8 +69,9 @@ public abstract class BukkitParticleProvider {
* packets such as block crack or particle colour on redstone /
* firework particles.
*/
public static void sendToPlayer(final Player player, final Location location, final String particleId, final float offsetX, final float offsetY,
final float offsetZ, final float speed, final int count, final int[] data) {
public static void sendToPlayer(final Player player, final Location location, final String particleId,
final float offsetX, final float offsetY, final float offsetZ, final float speed,
final int count, final int[] data) {
final Object particle;
final BukkitPreBuiltParticle pbp = BukkitPreBuiltParticle.fromIdentifier(particleId);
if (pbp != null) {
@ -123,7 +125,8 @@ public abstract class BukkitParticleProvider {
* @param particle
* The pre-built particle.
*/
public static void sendToPlayer(final Player player, final Location location, final BukkitPreBuiltParticle particle) {
public static void sendToPlayer(final Player player, final Location location,
final BukkitPreBuiltParticle particle) {
final Location pos = location.clone();
if (particle.getVector() != null) {
pos.add(particle.getVector());