ソースを参照

CharEffectList rework DataPack part.

Zoey76 10 年 前
コミット
d2eaf77f9b

+ 1 - 1
L2J_DataPack/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java

@@ -247,7 +247,7 @@ public class AdminBuffs implements IAdminCommandHandler
 		}
 		else
 		{
-			effects.addAll(target.getEffectList().getPassives().values());
+			effects.addAll(target.getEffectList().getPassives());
 		}
 		
 		if ((page > ((effects.size() / PAGE_LIMIT) + 1)) || (page < 1))

+ 4 - 4
L2J_DataPack/dist/game/data/scripts/instances/AbstractInstance.java

@@ -247,7 +247,7 @@ public abstract class AbstractInstance extends AbstractNpcAI
 			}
 			case WHITELIST:
 			{
-				for (BuffInfo info : player.getEffectList().getBuffs().values())
+				for (BuffInfo info : player.getEffectList().getBuffs())
 				{
 					if (!inst.getBuffExceptionList().contains(info.getSkill().getId()))
 					{
@@ -258,7 +258,7 @@ public abstract class AbstractInstance extends AbstractNpcAI
 				final L2Summon summon = player.getSummon();
 				if (summon != null)
 				{
-					for (BuffInfo info : summon.getEffectList().getBuffs().values())
+					for (BuffInfo info : summon.getEffectList().getBuffs())
 					{
 						if (!inst.getBuffExceptionList().contains(info.getSkill().getId()))
 						{
@@ -270,7 +270,7 @@ public abstract class AbstractInstance extends AbstractNpcAI
 			}
 			case BLACKLIST:
 			{
-				for (BuffInfo info : player.getEffectList().getBuffs().values())
+				for (BuffInfo info : player.getEffectList().getBuffs())
 				{
 					if (inst.getBuffExceptionList().contains(info.getSkill().getId()))
 					{
@@ -281,7 +281,7 @@ public abstract class AbstractInstance extends AbstractNpcAI
 				final L2Summon summon = player.getSummon();
 				if (summon != null)
 				{
-					for (BuffInfo info : summon.getEffectList().getBuffs().values())
+					for (BuffInfo info : summon.getEffectList().getBuffs())
 					{
 						if (inst.getBuffExceptionList().contains(info.getSkill().getId()))
 						{