Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EventManager jdk7 patch

Browse Source 
Fixed a code bug when compiling with Java 7.
This commit is contained in:
ronancpl
2018-11-01 14:05:57 -02:00
parent ba303432ff
commit 9c7763be8c
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/scripting/event/EventManager.java
View File

@@ -60,7 +60,6 @@ import net.server.audit.LockCollector;
import net.server.audit.locks.MonitoredLockType; import net.server.audit.locks.MonitoredLockType;
import net.server.audit.locks.MonitoredReentrantLock; import net.server.audit.locks.MonitoredReentrantLock;
import net.server.audit.locks.factory.MonitoredReentrantLockFactory; import net.server.audit.locks.factory.MonitoredReentrantLockFactory;
import jdk.nashorn.api.scripting.ScriptUtils;
/** /**
* *
@@ -647,10 +646,15 @@ public class EventManager {
if(p != null) { if(p != null) {
List<MaplePartyCharacter> lmpc; List<MaplePartyCharacter> lmpc;
/*
if(ServerConstants.JAVA_8) if(ServerConstants.JAVA_8)
lmpc = new ArrayList<>(((Map<String, MaplePartyCharacter>)(ScriptUtils.convert(p, Map.class))).values()); lmpc = new ArrayList<>(((Map<String, MaplePartyCharacter>)(ScriptUtils.convert(p, Map.class))).values());
else else
lmpc = new ArrayList<>((List<MaplePartyCharacter>) p); lmpc = new ArrayList<>((List<MaplePartyCharacter>) p);
*/
lmpc = new ArrayList<>((List<MaplePartyCharacter>) p);
party.setEligibleMembers(lmpc); party.setEligibleMembers(lmpc);
return lmpc; return lmpc;
} }