浏览代码

doors again.

JIV 15 年之前
父节点
当前提交
8921360ce6
共有 1 个文件被更改,包括 5 次插入3 次删除
  1. 5 3
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/L2Character.java

+ 5 - 3
L2_GameServer/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -346,9 +346,11 @@ public abstract class L2Character extends L2Object
 		_template = template;
 		_template = template;
 		
 		
 		if (this instanceof L2DoorInstance)
 		if (this instanceof L2DoorInstance)
+		{
 			_calculators = Formulas.getStdDoorCalculators();
 			_calculators = Formulas.getStdDoorCalculators();
-
-		if (template != null && this instanceof L2Npc)
+			_skills = null;
+		}
+		else if (template != null && this instanceof L2Npc)
 		{
 		{
 			// Copy the Standard Calcultors of the L2NPCInstance in _calculators
 			// Copy the Standard Calcultors of the L2NPCInstance in _calculators
 			_calculators = NPC_STD_CALCULATOR;
 			_calculators = NPC_STD_CALCULATOR;
@@ -4518,7 +4520,7 @@ public abstract class L2Character extends L2Object
 						|| this instanceof L2MinionInstance
 						|| this instanceof L2MinionInstance
 						|| this.isInCombat())
 						|| this.isInCombat())
 				{
 				{
-					m.geoPath = PathFinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceId(), isInstanceType(InstanceType.L2Playable));
+					m.geoPath = PathFinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceId(), this instanceof L2Playable);
                 	if (m.geoPath == null || m.geoPath.size() < 2) // No path found
                 	if (m.geoPath == null || m.geoPath.size() < 2) // No path found
                 	{
                 	{
                 		// * Even though there's no path found (remember geonodes aren't perfect), 
                 		// * Even though there's no path found (remember geonodes aren't perfect),