From c124e58bbd54e40d61c27d26382ed69989dc747b Mon Sep 17 00:00:00 2001
From: Mads Mogensen <mads256c@elev.aatg.dk>
Date: Wed, 9 Jan 2019 20:10:48 +0100
Subject: [PATCH] Show custom name

---
 .../org/dynmap/mobs/DynmapMobsPlugin.java     | 34 ++++++++-----------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/main/java/org/dynmap/mobs/DynmapMobsPlugin.java b/src/main/java/org/dynmap/mobs/DynmapMobsPlugin.java
index 2882425..16b597f 100644
--- a/src/main/java/org/dynmap/mobs/DynmapMobsPlugin.java
+++ b/src/main/java/org/dynmap/mobs/DynmapMobsPlugin.java
@@ -1,21 +1,5 @@
 package org.dynmap.mobs;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
-import org.bukkit.World;
+import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.*;
@@ -24,14 +8,21 @@
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.server.PluginEnableEvent;
-import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginManager;
+import org.bukkit.plugin.java.JavaPlugin;
 import org.dynmap.DynmapAPI;
+import org.dynmap.markers.Marker;
 import org.dynmap.markers.MarkerAPI;
 import org.dynmap.markers.MarkerIcon;
 import org.dynmap.markers.MarkerSet;
-import org.dynmap.markers.Marker;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Method;
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 public class DynmapMobsPlugin extends JavaPlugin {
     private static Logger log;
@@ -400,6 +391,11 @@ else if(mobs[i].mobid.equals("vanillahorse") || mobs[i].mobid.equals("donkey") |
                 if(label == null) {
                     label = mobs[i].label;
                 }
+
+                if (le.getCustomName() != null) {
+                    label = le.getCustomName() + " (" + label + ")";
+                }
+
                 Location loc = le.getLocation();
                 Block blk = null;
                 if(hideifshadow < 15) {