combat

Index: java/net/sf/l2j/gameserver/model/actor/instance/L2VillageMasterInstance.java
===================================================================
--- java/net/sf/l2j/gameserver/model/actor/instance/L2VillageMasterInstance.java    (revision 6)
+++ java/net/sf/l2j/gameserver/model/actor/instance/L2VillageMasterInstance.java    (working copy)
@@ -172,6 +172,12 @@
                player.sendPacket(SystemMessageId.SUBCLASS_NO_CHANGE_OR_CREATE_WHILE_SKILL_IN_USE);
                return;
            }
+           // Player cannot change subclass while is in combat.
+           if (player.isInCombat())
+           {
+               player.sendMessage("You cannot do this action while you are in combat.");
+               return;
+           }

            // Affecting subclasses (add/del/change) if registered in Olympiads makes you ineligible to compete.
            if (OlympiadManager.getInstance().isRegisteredInComp(player))