From 55efcc454c5d377283167b215b8b3381b5aa74ee Mon Sep 17 00:00:00 2001 From: J3fftw1 <44972470+J3fftw1@users.noreply.github.com> Date: Thu, 3 Oct 2019 22:46:18 +0200 Subject: [PATCH 1/6] Update TeleportationSequence.java --- src/me/mrCookieSlime/Slimefun/GPS/TeleportationSequence.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/me/mrCookieSlime/Slimefun/GPS/TeleportationSequence.java b/src/me/mrCookieSlime/Slimefun/GPS/TeleportationSequence.java index 35f0c8b6a..6be8211d7 100644 --- a/src/me/mrCookieSlime/Slimefun/GPS/TeleportationSequence.java +++ b/src/me/mrCookieSlime/Slimefun/GPS/TeleportationSequence.java @@ -82,7 +82,7 @@ public final class TeleportationSequence { } destination.getWorld().spawnParticle(Particle.PORTAL,new Location(destination.getWorld(), destination.getX(), destination.getY() + 1, destination.getZ()),progress * 2, 0.2F, 0.8F, 0.2F ); - destination.getWorld().playSound(destination, Sound.ENTITY_BLAZE_DEATH, 2F, 1.4F); + destination.getWorld().playSound(destination, Sound.ENTITY_BLAZE_DEATH, 1F, 1.4F); SlimefunPlugin.getUtilities().teleporterUsers.remove(uuid); } else { @@ -93,7 +93,7 @@ public final class TeleportationSequence { subtitle.send(TitleType.SUBTITLE, p); source.getWorld().spawnParticle(Particle.PORTAL, source, progress * 2, 0.2F, 0.8F, 0.2F); - source.getWorld().playSound(source, Sound.UI_BUTTON_CLICK, 1.7F, 0.6F); + source.getWorld().playSound(source, Sound.UI_BUTTON_CLICK, 1F, 0.6F); Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> updateProgress(uuid, speed, progress + speed, source, destination, resistance), 10L); } From a30650d16d62cde236024941b22200d33962b0df Mon Sep 17 00:00:00 2001 From: J3fftw1 <44972470+J3fftw1@users.noreply.github.com> Date: Thu, 3 Oct 2019 22:51:36 +0200 Subject: [PATCH 2/6] Update ArmorListener.java --- src/me/mrCookieSlime/Slimefun/listeners/ArmorListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/me/mrCookieSlime/Slimefun/listeners/ArmorListener.java b/src/me/mrCookieSlime/Slimefun/listeners/ArmorListener.java index 1476ae16a..a3f596492 100644 --- a/src/me/mrCookieSlime/Slimefun/listeners/ArmorListener.java +++ b/src/me/mrCookieSlime/Slimefun/listeners/ArmorListener.java @@ -59,7 +59,7 @@ public class ArmorListener implements Listener { && e.getCause() == DamageCause.FALL ) { e.setCancelled(true); - p.getWorld().playSound(p.getLocation(), Sound.ENTITY_ZOMBIE_BREAK_WOODEN_DOOR, 2F, 2F); + p.getWorld().playSound(p.getLocation(), Sound.ENTITY_ZOMBIE_BREAK_WOODEN_DOOR, 1F, 2F); p.setVelocity(new Vector(0.0, 0.7, 0.0)); for (Entity n: p.getNearbyEntities(4, 4, 4)) { if (n instanceof LivingEntity && !n.getUniqueId().equals(p.getUniqueId())) { From 7c8dfac1b488adc0e61c403c401390525d281f7e Mon Sep 17 00:00:00 2001 From: J3fftw1 <44972470+J3fftw1@users.noreply.github.com> Date: Thu, 3 Oct 2019 22:54:11 +0200 Subject: [PATCH 3/6] Update RitualAnimation.java --- .../mrCookieSlime/Slimefun/ancient_altar/RitualAnimation.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/me/mrCookieSlime/Slimefun/ancient_altar/RitualAnimation.java b/src/me/mrCookieSlime/Slimefun/ancient_altar/RitualAnimation.java index d7c9655b1..4d10cc5f4 100644 --- a/src/me/mrCookieSlime/Slimefun/ancient_altar/RitualAnimation.java +++ b/src/me/mrCookieSlime/Slimefun/ancient_altar/RitualAnimation.java @@ -110,7 +110,7 @@ public class RitualAnimation implements Runnable { else { particles.add(pedestal.getLocation().add(0.5, 1.5, 0.5)); items.add(AncientAltarListener.fixItemStack(item.getItemStack(), item.getCustomName())); - pedestal.getWorld().playSound(pedestal.getLocation(), Sound.ENTITY_ENDERMAN_TELEPORT, 5F, 2F); + pedestal.getWorld().playSound(pedestal.getLocation(), Sound.ENTITY_ENDERMAN_TELEPORT, 1F, 2F); try { l.getWorld().spawnParticle(Particle.ENCHANTMENT_TABLE,pedestal.getLocation().add(0.5, 1.5, 0.5),16, 0.3F, 0.2F, 0.3F); @@ -132,7 +132,7 @@ public class RitualAnimation implements Runnable { // This should re-enable altar blocks on craft failure. utilities.altarinuse.remove(altar.getLocation()); - l.getWorld().playSound(l, Sound.ENTITY_ZOMBIE_ATTACK_IRON_DOOR, 5F, 1F); + l.getWorld().playSound(l, Sound.ENTITY_ZOMBIE_ATTACK_IRON_DOOR, 1F, 1F); itemLock.clear(); altars.remove(altar); } From 445312e31f2a14f565a5a5aa7ec519a6fbee3fd4 Mon Sep 17 00:00:00 2001 From: J3fftw1 <44972470+J3fftw1@users.noreply.github.com> Date: Thu, 3 Oct 2019 22:57:41 +0200 Subject: [PATCH 4/6] Update MagnetTask.java --- src/me/mrCookieSlime/Slimefun/Objects/tasks/MagnetTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/me/mrCookieSlime/Slimefun/Objects/tasks/MagnetTask.java b/src/me/mrCookieSlime/Slimefun/Objects/tasks/MagnetTask.java index 0853a018d..f7a724c88 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/tasks/MagnetTask.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/tasks/MagnetTask.java @@ -18,7 +18,7 @@ public class MagnetTask extends SlimefunTask { for (Entity item: Bukkit.getPlayer(uuid).getNearbyEntities(6D, 6D, 6D)) { if (item instanceof Item && !item.hasMetadata("no_pickup") && ((Item) item).getPickupDelay() <= 0) { item.teleport(Bukkit.getPlayer(uuid).getEyeLocation()); - Bukkit.getPlayer(uuid).getWorld().playSound(Bukkit.getPlayer(uuid).getEyeLocation(), Sound.ENTITY_ENDERMAN_TELEPORT, 5L, 2L); + Bukkit.getPlayer(uuid).getWorld().playSound(Bukkit.getPlayer(uuid).getEyeLocation(), Sound.ENTITY_ENDERMAN_TELEPORT, 1L, 2L); } } } From 9aab707291baed533a6f6de934c4f7f4223d3807 Mon Sep 17 00:00:00 2001 From: J3fftw1 <44972470+J3fftw1@users.noreply.github.com> Date: Thu, 3 Oct 2019 23:08:41 +0200 Subject: [PATCH 5/6] Update MagnetTask.java --- src/me/mrCookieSlime/Slimefun/Objects/tasks/MagnetTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/me/mrCookieSlime/Slimefun/Objects/tasks/MagnetTask.java b/src/me/mrCookieSlime/Slimefun/Objects/tasks/MagnetTask.java index f7a724c88..ae2e4d11a 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/tasks/MagnetTask.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/tasks/MagnetTask.java @@ -18,7 +18,7 @@ public class MagnetTask extends SlimefunTask { for (Entity item: Bukkit.getPlayer(uuid).getNearbyEntities(6D, 6D, 6D)) { if (item instanceof Item && !item.hasMetadata("no_pickup") && ((Item) item).getPickupDelay() <= 0) { item.teleport(Bukkit.getPlayer(uuid).getEyeLocation()); - Bukkit.getPlayer(uuid).getWorld().playSound(Bukkit.getPlayer(uuid).getEyeLocation(), Sound.ENTITY_ENDERMAN_TELEPORT, 1L, 2L); + Bukkit.getPlayer(uuid).getWorld().playSound(Bukkit.getPlayer(uuid).getEyeLocation(), Sound.ENTITY_ENDERMAN_TELEPORT, 1F, 2F); } } } From 27521167a884c31cc3009f3646ec8cd364ac6f41 Mon Sep 17 00:00:00 2001 From: J3fftw1 <44972470+J3fftw1@users.noreply.github.com> Date: Fri, 4 Oct 2019 13:02:06 +0200 Subject: [PATCH 6/6] Update InfusedHopper.java --- .../Slimefun/Objects/SlimefunItem/machines/InfusedHopper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/InfusedHopper.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/InfusedHopper.java index 23c35c62a..b078f0e5a 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/InfusedHopper.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/InfusedHopper.java @@ -45,7 +45,7 @@ public class InfusedHopper extends SimpleSlimefunItem { } if (sound) { - b.getWorld().playSound(b.getLocation(), Sound.ENTITY_ENDERMAN_TELEPORT, 5F, 2F); + b.getWorld().playSound(b.getLocation(), Sound.ENTITY_ENDERMAN_TELEPORT, 1F, 2F); } }