From 0154d6d8504b2365e85a3b31147a4b5efff27175 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 4 Feb 2020 22:29:11 +0000
Subject: [PATCH] Improved NPC and Door instance information htmls.

---
 .../model/actor/instance/DoorInstance.java    | 26 ++++++++-----------
 .../model/actor/instance/NpcInstance.java     |  2 +-
 2 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/DoorInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/DoorInstance.java
index 0950ef1e2a..8d5684cf23 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/DoorInstance.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/DoorInstance.java
@@ -588,23 +588,19 @@ public class DoorInstance extends Creature
 				player.sendPacket(new DoorStatusUpdate(this));
 			}
 			final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-			final StringBuilder html1 = new StringBuilder("<html><body><table border=0>");
-			html1.append("<tr><td><font color=\"LEVEL\">Door Information</font><br></td></tr>");
-			html1.append("<tr><td>Current HP  " + getCurrentHp() + "</td></tr>");
-			html1.append("<tr><td>Max HP       " + getMaxHp() + "</td></tr>");
-			html1.append("<tr><td>Object ID: " + getObjectId() + "</td></tr>");
-			html1.append("<tr><td>Door ID: " + _doorId + "</td></tr>");
-			html1.append("<tr><td><br></td></tr>");
-			html1.append("<tr><td>Class: " + getClass().getSimpleName() + "</td></tr>");
-			html1.append("<tr><td><br></td></tr>");
-			html1.append("</table>");
-			html1.append("<table><tr>");
-			html1.append("<td><button value=\"Open\" action=\"bypass -h admin_open " + _doorId + "\" width=65 height=19 back=\"L2UI_ch3.smallbutton2_over\" fore=\"L2UI_ch3.smallbutton2\"></td>");
-			html1.append("<td><button value=\"Close\" action=\"bypass -h admin_close " + _doorId + "\" width=65 height=19 back=\"L2UI_ch3.smallbutton2_over\" fore=\"L2UI_ch3.smallbutton2\"></td>");
+			final StringBuilder html1 = new StringBuilder("<html><body><center><font color=\"LEVEL\">Door Information</font></center>");
+			html1.append("<table border=0><tr>");
 			html1.append("<td><button value=\"Kill\" action=\"bypass -h admin_kill\" width=65 height=19 back=\"L2UI_ch3.smallbutton2_over\" fore=\"L2UI_ch3.smallbutton2\"></td>");
 			html1.append("<td><button value=\"Delete\" action=\"bypass -h admin_delete\" width=65 height=19 back=\"L2UI_ch3.smallbutton2_over\" fore=\"L2UI_ch3.smallbutton2\"></td>");
-			html1.append("</tr></table></body></html>");
-			
+			html1.append("<td><button value=\"Open\" action=\"bypass -h admin_open " + _doorId + "\" width=65 height=19 back=\"L2UI_ch3.smallbutton2_over\" fore=\"L2UI_ch3.smallbutton2\"></td>");
+			html1.append("<td><button value=\"Close\" action=\"bypass -h admin_close " + _doorId + "\" width=65 height=19 back=\"L2UI_ch3.smallbutton2_over\" fore=\"L2UI_ch3.smallbutton2\"></td>");
+			html1.append("</tr></table><br><table border=0 width=270>");
+			html1.append("<tr><td width=90>Instance Type:</td><td width=180>" + getClass().getSimpleName() + "</td></tr>");
+			html1.append("<tr><td>Current HP:</td><td>" + getCurrentHp() + "</td></tr>");
+			html1.append("<tr><td>Max HP:</td><td>" + getMaxHp() + "</td></tr>");
+			html1.append("<tr><td>Object ID:</td><td>" + getObjectId() + "</td></tr>");
+			html1.append("<tr><td>Door ID:</td><td>" + _doorId + "</td></tr>");
+			html1.append("</table></body></html>");
 			html.setHtml(html1.toString());
 			player.sendPacket(html);
 		}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java
index ff72c99083..96c13d79cd 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java
@@ -853,7 +853,7 @@ public class NpcInstance extends Creature
 			final StringBuilder html1 = new StringBuilder("<html><body><center><font color=\"LEVEL\">NPC Information</font></center>");
 			final String className = getClass().getSimpleName();
 			
-			html1.append("<br><center><table><tr>");
+			html1.append("<center><table><tr>");
 			html1.append("<td><button value=\"Kill\" action=\"bypass -h admin_kill\" width=65 height=19 back=\"L2UI_ch3.smallbutton2_over\" fore=\"L2UI_ch3.smallbutton2\"></td>");
 			html1.append("<td><button value=\"Delete\" action=\"bypass -h admin_delete\" width=65 height=19 back=\"L2UI_ch3.smallbutton2_over\" fore=\"L2UI_ch3.smallbutton2\"></td></tr>");
 			html1.append("<td><button value=\"Skills\" action=\"bypass -h admin_show_skilllist_npc " + getTemplate().getNpcId() + "\" width=65 height=19 back=\"L2UI_ch3.smallbutton2_over\" fore=\"L2UI_ch3.smallbutton2\"></td>");

Instance Type:	" + getClass().getSimpleName() + "
Current HP:	" + getCurrentHp() + "
Max HP:	" + getMaxHp() + "
Object ID:	" + getObjectId() + "
Door ID:	" + _doorId + "