From f90f1c609fc25479a131fa96bbcdbe82da7e620e Mon Sep 17 00:00:00 2001 From: coder4321 <48343703+coder4321@users.noreply.github.com> Date: Sat, 7 Dec 2019 00:41:26 -0800 Subject: [PATCH] =?UTF-8?q?[CI=20skip]=20Updated=20Teleport=20Sounds=20and?= =?UTF-8?q?=20Fixed=20The=20=E2=80=9Ccolor=20codes=20are=20supported=20tex?= =?UTF-8?q?t=E2=80=9D=20for=20elevators=20=20(#1283)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update TeleportationSequence.java * Update TeleportationSequence.java * Update Elevator.java --- src/main/java/me/mrCookieSlime/Slimefun/GPS/Elevator.java | 2 +- .../me/mrCookieSlime/Slimefun/GPS/TeleportationSequence.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/me/mrCookieSlime/Slimefun/GPS/Elevator.java b/src/main/java/me/mrCookieSlime/Slimefun/GPS/Elevator.java index 73cde4281..d915c38df 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/GPS/Elevator.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/GPS/Elevator.java @@ -30,7 +30,7 @@ public final class Elevator { pl.closeInventory(); pl.sendMessage(""); pl.sendMessage(ChatColor.translateAlternateColorCodes('&', "&4&l>> &ePlease enter a Name for this Floor in your Chat!")); - pl.sendMessage(ChatColor.translateAlternateColorCodes('&', "&4&l>> &e(Chat Colors are supported!")); + pl.sendMessage(ChatColor.translateAlternateColorCodes('&', "&4&l>> &e(Chat Colors are supported!)")); pl.sendMessage(""); ChatInput.waitForPlayer(SlimefunPlugin.instance, pl, message -> { diff --git a/src/main/java/me/mrCookieSlime/Slimefun/GPS/TeleportationSequence.java b/src/main/java/me/mrCookieSlime/Slimefun/GPS/TeleportationSequence.java index 6be8211d7..5a2f8c770 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/GPS/TeleportationSequence.java +++ b/src/main/java/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, 1F, 1.4F); + destination.getWorld().playSound(destination, Sound.BLOCK_BEACON_ACTIVATE, 1F, 1F); 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, 1F, 0.6F); + source.getWorld().playSound(source, Sound.BLOCK_BEACON_AMBIENT, 1F, 0.6F); Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> updateProgress(uuid, speed, progress + speed, source, destination, resistance), 10L); }