From 66b573e10e4c613c86913cffc7832b411fd67450 Mon Sep 17 00:00:00 2001
From: TheBusyBiscuit <mrCookieSlime@gmail.com>
Date: Thu, 9 Jan 2020 23:33:11 +0100
Subject: [PATCH] Fixes #1355

---
 CHANGELOG.md                                             | 9 +++++++++
 .../slimefun4/core/commands/SlimefunCommand.java         | 2 +-
 .../slimefun4/core/services/MetricsService.java          | 2 +-
 .../java/me/mrCookieSlime/Slimefun/GPS/Elevator.java     | 4 ++--
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b4ea17428..253654644 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,15 @@
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
+## Release Candidate 5 (TBD)
+
+### Additions
+
+### Changes
+
+### Fixes
+* Fixed #1355
+
 ## Release Candidate 4 (06 Jan 2020)
 https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#4
 
diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/SlimefunCommand.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/SlimefunCommand.java
index a4b4360fe..753ca033d 100644
--- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/SlimefunCommand.java
+++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/SlimefunCommand.java
@@ -78,7 +78,7 @@ public class SlimefunCommand implements CommandExecutor, Listener {
 						
 						p.teleport(new Location(p.getWorld(), x + 0.5, y + 0.4, z + 0.5, yaw, p.getEyeLocation().getPitch()));
 						
-						String title = "&r" + ChatColor.translateAlternateColorCodes('&', BlockStorage.getLocationInfo(p.getWorld().getBlockAt(x, y, z).getLocation(), "floor"));
+						String title = ChatColor.RESET + ChatColor.translateAlternateColorCodes('&', BlockStorage.getLocationInfo(p.getWorld().getBlockAt(x, y, z).getLocation(), "floor"));
 						p.sendTitle(title, " ", 20, 60, 20);
 					}
 				}
diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/MetricsService.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/MetricsService.java
index 012d4e5f4..252856f99 100644
--- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/MetricsService.java
+++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/MetricsService.java
@@ -16,7 +16,7 @@ public class MetricsService extends Metrics {
 		addCustomChart(new SimplePie("resourcepack", () -> {
 			String version = SlimefunPlugin.getItemTextureService().getVersion();
 			
-			if (version != null) {
+			if (version != null && version.startsWith("v")) {
 				return version + " (Official)";
 			}
 			else if (SlimefunPlugin.getItemTextureService().isActive()) {
diff --git a/src/main/java/me/mrCookieSlime/Slimefun/GPS/Elevator.java b/src/main/java/me/mrCookieSlime/Slimefun/GPS/Elevator.java
index 880c494d0..dc2feb150 100644
--- a/src/main/java/me/mrCookieSlime/Slimefun/GPS/Elevator.java
+++ b/src/main/java/me/mrCookieSlime/Slimefun/GPS/Elevator.java
@@ -21,7 +21,7 @@ public final class Elevator {
 
 	private Elevator() {}
 	
-	public static void openEditor(Player p, final Block b) {
+	public static void openEditor(Player p, Block b) {
 		ChestMenu menu = new ChestMenu("Elevator Settings");
 		
 		menu.addItem(4, new CustomItem(Material.NAME_TAG, "&7Floor Name &e(Click to edit)", "", "&r" + ChatColor.translateAlternateColorCodes('&', BlockStorage.getLocationInfo(b.getLocation(), "floor"))));
@@ -74,7 +74,7 @@ public final class Elevator {
 				else {
 					tellraw.addText("&7" + index + ". &r" + floor + "\n");
 					tellraw.addHoverEvent(HoverAction.SHOW_TEXT, "\n&eClick to teleport to this Floor\n&r" + floor + "\n");
-					tellraw.addClickEvent(me.mrCookieSlime.CSCoreLibPlugin.general.Chat.TellRawMessage.ClickAction.RUN_COMMAND, "/sf elevator " + block.getX() + ' ' + block.getY() + ' ' + block.getZ() + " ");
+					tellraw.addClickEvent(TellRawMessage.ClickAction.RUN_COMMAND, "/sf elevator " + block.getX() + ' ' + block.getY() + ' ' + block.getZ() + " ");
 				}
 				
 				index++;