Anonymous

Index: java/net/sf/l2j/gameserver/model/actor/instance/L2NpcInstance.java
===================================================================
--- java/net/sf/l2j/gameserver/model/actor/instance/L2NpcInstance.java	(revision 1226)
+++ java/net/sf/l2j/gameserver/model/actor/instance/L2NpcInstance.java	(working copy)
@@ -857,30 +857,30 @@
             }
             else if (command.equalsIgnoreCase("TerritoryStatus"))
             {
-                NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-                html.setFile("data/html/territorystatus.htm");
-                html.replace("%objectId%", String.valueOf(getObjectId()));
-                html.replace("%npcname%", getName());
-                
-                if (getIsInTown())
-                {
-                    html.replace("%castlename%", getCastle().getName());
-                    html.replace("%taxpercent%", "" + getCastle().getTaxPercent());
-                    
-                    if (getCastle().getOwnerId() > 0)
+            	NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
+            	if (getIsInTown())
+            	{
+            		if (getCastle().getOwnerId() > 0)
+            		{
+            			html.setFile("data/html/territorystatus.htm");
+            			html.replace("%objectId%", String.valueOf(getObjectId()));
+            			html.replace("%castlename%", getCastle().getName());
+            			html.replace("%taxpercent%", "" + getCastle().getTaxPercent());
+            			L2Clan clan = ClanTable.getInstance().getClan(getCastle().getOwnerId());
+            			html.replace("%clanname%", clan.getName());
+            			html.replace("%clanleadername%", clan.getLeaderName());
+            		}
+            		else
                     {
-                        L2Clan clan = ClanTable.getInstance().getClan(getCastle().getOwnerId());
-                        html.replace("%clanname%", clan.getName());
-                        html.replace("%clanleadername%", clan.getLeaderName());
+            			html.setFile("data/html/territorynoclan.htm");
+            			html.replace("%objectId%", String.valueOf(getObjectId()));
+            			html.replace("%castlename%", getCastle().getName());
                     }
-                    else
-                    {
-                        html.replace("%clanname%", "NPC");
-                        html.replace("%clanleadername%", "NPC");
-                    }
-                }
+            	}
                 else
                 {
+                	html.setFile("data/html/territorystatus.htm");
+                	html.replace("%objectId%", String.valueOf(getObjectId()));
                     html.replace("%castlename%", "Open");
                     html.replace("%taxpercent%", "0");