From ba303432fffc130fba70cf28b529a9d348a30fa0 Mon Sep 17 00:00:00 2001
From: asafgb <asafshazar@gmail.com>
Date: Sat, 27 Oct 2018 05:59:19 +0300
Subject: [PATCH] Fix npcs script (#266)

* fix the npcs

* add java8 compability

* .
---
 src/scripting/event/EventInstanceManager.java | 9 +++++++--
 src/scripting/event/EventManager.java         | 7 ++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/scripting/event/EventInstanceManager.java b/src/scripting/event/EventInstanceManager.java
index ce17333c45..fd912b9658 100644
--- a/src/scripting/event/EventInstanceManager.java
+++ b/src/scripting/event/EventInstanceManager.java
@@ -987,9 +987,14 @@ public class EventInstanceManager {
         }
         
         private List<Integer> convertToIntegerArray(List<Double> list) {
-                List<Integer> intList = new ArrayList<>();
+            List<Integer> intList;
+            if(ServerConstants.JAVA_8)
+                 intList=new ArrayList<Integer> (new ArrayList(java.util.Arrays.asList(list.toArray())));
+            else
+            {
+                 intList = new ArrayList<>();
                 for(Double d: list) intList.add(d.intValue());
-
+            }
                 return intList;
         }
         
diff --git a/src/scripting/event/EventManager.java b/src/scripting/event/EventManager.java
index 286997cd2e..8a961be132 100644
--- a/src/scripting/event/EventManager.java
+++ b/src/scripting/event/EventManager.java
@@ -60,6 +60,7 @@ import net.server.audit.LockCollector;
 import net.server.audit.locks.MonitoredLockType;
 import net.server.audit.locks.MonitoredReentrantLock;
 import net.server.audit.locks.factory.MonitoredReentrantLockFactory;
+import jdk.nashorn.api.scripting.ScriptUtils;
 
 /**
  *
@@ -645,7 +646,11 @@ public class EventManager {
             Object p = iv.invokeFunction("getEligibleParty", party.getPartyMembers());
             
             if(p != null) {
-                List<MaplePartyCharacter> lmpc = new ArrayList<>((List<MaplePartyCharacter>) p);
+                List<MaplePartyCharacter> lmpc;
+                if(ServerConstants.JAVA_8)
+                    lmpc = new ArrayList<>(((Map<String, MaplePartyCharacter>)(ScriptUtils.convert(p, Map.class))).values());
+                else
+                    lmpc = new ArrayList<>((List<MaplePartyCharacter>) p);
                 party.setEligibleMembers(lmpc);
                 return lmpc;
             }