Decouples NPCService and NPCController from Lineage2Client class

l2jserver2-gameserver/data/template/npc/1-ThomasDTurkey.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="1" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/10-JackSage.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="10" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/11-EvaSObelisk.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="11" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="false" attackable="true">

l2jserver2-gameserver/data/template/npc/12.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="12" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="false" attackable="true">

l2jserver2-gameserver/data/template/npc/12774-YoungSquash.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="12774" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/12775-HighQualitySquash.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="12775" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/12776-LowQualitySquash.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<template:npc controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+<template:npc controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
 	id="12776" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
 	<info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/12777-LargeYoungSquash.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="12777" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/12778-HighQualityLargeSquash.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="12778" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/12779-LowQualityLargeSquash.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="12779" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13-WarmHeartedSno.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13001-HeartOfWarding.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13001" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13006-ChristmasTree.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13006" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13014.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13014" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13015.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13015" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13016-KingSquash.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13016" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13017-EmperorSquash.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<template:npc controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+<template:npc controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
 	id="13017" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
 	<info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13031-HugePig.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13031" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13032-HugePig.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13032" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13033-HugePig.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13033" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13035-GoldenPig.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13035" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13037-Trap.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13037" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13038-Trap.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13038" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13039-Trap.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13039" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13040-Trap.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13040" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13041-Trap.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13041" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13042-Trap.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13042" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13043-Trap.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13043" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13044-Trap.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13044" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13045-Trap.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13045" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13046-Trap.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13046" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13047-Trap.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13047" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13048-Trap.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13048" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13049-Trap.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13049" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13050-Trap.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13050" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13051-Trap.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13051" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13052-Trap.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13052" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13053-Trap.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13053" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13054-Trap.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13054" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13055-Trap.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13055" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13056-Trap.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13056" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13057-Trap.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13057" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13058-Trap.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13058" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13059-Trap.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13059" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13060-Trap.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13060" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13061-Trap.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13061" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13062-Trap.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13062" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13063-Trap.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13063" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13064-Trap.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13064" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13065-Trap.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13065" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13066-Trap.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13066" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13067-Trap.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13067" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13068-Trap.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13068" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13069-Trap.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13069" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13070-Trap.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13070" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13077-OnyxBeast.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13077" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13078-DoomWraith.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13078" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13079-GrailApostle.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13079" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13080-GrailApostle.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13080" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13081-Unicorn.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13081" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13082-LilimKnight.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13082" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13083-GolemGuardian.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13083" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13084-InfernoDrake.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13084" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13085-DragonBomber.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13085" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13086-Zariche.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13086" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13087-Akamanah.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13087" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13088-FinalForm.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13088" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13089-FinalForm.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13089" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13090-Native.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13090" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13091-Yeti.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13091" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13092-Buffalo.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13092" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13093-Pig.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13093" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13094-Zombie.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13094" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13095-Pixy.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13095" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13096-Rabbit.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13096" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13099-Zaken.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13099" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13100-Anakim.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13100" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13101-Benom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13101" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13102-Gordon.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13102" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13103-Ranku.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13103" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13104-Kiyachi.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13104" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13105-DemonPrince.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13105" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13106-HereticMale.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13106" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13107-HereticFemale.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13107" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13108-ValeMaster.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13108" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13109-SaberToothTiger.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13109" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13110-OlMahum.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13110" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13111-DollBlader.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13111" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13112-DivineKnight.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13112" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13113-DivineWarrior.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13113" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13114-DivineRogue.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13114" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13115-DivineHealer.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13115" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13116-DivineWizard.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13116" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13117-DivineEnchanter.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13117" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13118-DivineSummoner.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13118" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13119-DwarfGolem.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13119" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13120-GiantRat.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13120" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13121-GiantRat.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13121" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13122-GiantRat.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13122" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">

l2jserver2-gameserver/data/template/npc/13123-SuperGiantRat.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template:npc
-    controller="com.l2jserver.model.world.npc.controller.BaseNPCController"
+    controller="com.l2jserver.model.world.npc.controller.impl.SimpleNPCController"
     id="13123" xsi:schemaLocation="http://schemas.l2jserver2.com/npc ../npc.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:template="http://schemas.l2jserver2.com/npc">
     <info aggressive="false" targetable="true" attackable="true">