Index: D:/Documents and Settings/Administrator/My Documents/workspace/L2_Kingdom_of_Kings_T1/java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminPolymorph.java
===================================================================
--- D:/Documents and Settings/Administrator/My Documents/workspace/L2_Kingdom_of_Kings_T1/java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminPolymorph.java	(revision 2009)
+++ D:/Documents and Settings/Administrator/My Documents/workspace/L2_Kingdom_of_Kings_T1/java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminPolymorph.java	(working copy)
@@ -84,6 +84,10 @@
                 String[] parts = command.split(" ");
                 if (parts.length >= 2)
                 {
+                	if (cha.isTransformed())
+                	{
+                		((L2Character)obj).stopTransformation(null);
+                	}
                     try
                     {
                         int id = Integer.parseInt(parts[1]);
@@ -103,7 +107,7 @@
                     }
                 }
                 else if (parts.length == 1)
-                    cha.untransform();
+                	((L2Character)obj).stopTransformation(null);
                 else
                 {
                     activeChar.sendMessage("Usage: //transform <id>");