Removed stream usage from Quest.
This commit is contained in:
parent
15491e7a3e
commit
cea3823382
@ -23,6 +23,7 @@ import java.util.ArrayList;
|
|||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@ -31,7 +32,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
|
|||||||
import java.util.function.Predicate;
|
import java.util.function.Predicate;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import org.l2jmobius.Config;
|
import org.l2jmobius.Config;
|
||||||
import org.l2jmobius.commons.database.DatabaseFactory;
|
import org.l2jmobius.commons.database.DatabaseFactory;
|
||||||
@ -626,14 +626,15 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
//@formatter:off
|
final Set<Quest> startingQuests = new HashSet<>();
|
||||||
final Set<Quest> startingQuests = npc.getListeners(EventType.ON_NPC_QUEST_START).stream()
|
for (AbstractEventListener listener : npc.getListeners(EventType.ON_NPC_QUEST_START))
|
||||||
.map(AbstractEventListener::getOwner)
|
{
|
||||||
.filter(Quest.class::isInstance)
|
final Object owner = listener.getOwner();
|
||||||
.map(Quest.class::cast)
|
if (owner instanceof Quest)
|
||||||
.distinct()
|
{
|
||||||
.collect(Collectors.toSet());
|
startingQuests.add((Quest) owner);
|
||||||
//@formatter:on
|
}
|
||||||
|
}
|
||||||
|
|
||||||
final String startConditionHtml = getStartConditionHtml(player, npc);
|
final String startConditionHtml = getStartConditionHtml(player, npc);
|
||||||
if (startingQuests.contains(this) && (startConditionHtml != null))
|
if (startingQuests.contains(this) && (startConditionHtml != null))
|
||||||
|
@ -23,6 +23,7 @@ import java.util.ArrayList;
|
|||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@ -31,7 +32,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
|
|||||||
import java.util.function.Predicate;
|
import java.util.function.Predicate;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import org.l2jmobius.Config;
|
import org.l2jmobius.Config;
|
||||||
import org.l2jmobius.commons.database.DatabaseFactory;
|
import org.l2jmobius.commons.database.DatabaseFactory;
|
||||||
@ -628,14 +628,15 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
//@formatter:off
|
final Set<Quest> startingQuests = new HashSet<>();
|
||||||
final Set<Quest> startingQuests = npc.getListeners(EventType.ON_NPC_QUEST_START).stream()
|
for (AbstractEventListener listener : npc.getListeners(EventType.ON_NPC_QUEST_START))
|
||||||
.map(AbstractEventListener::getOwner)
|
{
|
||||||
.filter(Quest.class::isInstance)
|
final Object owner = listener.getOwner();
|
||||||
.map(Quest.class::cast)
|
if (owner instanceof Quest)
|
||||||
.distinct()
|
{
|
||||||
.collect(Collectors.toSet());
|
startingQuests.add((Quest) owner);
|
||||||
//@formatter:on
|
}
|
||||||
|
}
|
||||||
|
|
||||||
final String startConditionHtml = getStartConditionHtml(player, npc);
|
final String startConditionHtml = getStartConditionHtml(player, npc);
|
||||||
if (startingQuests.contains(this) && (startConditionHtml != null))
|
if (startingQuests.contains(this) && (startConditionHtml != null))
|
||||||
|
@ -23,6 +23,7 @@ import java.util.ArrayList;
|
|||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@ -31,7 +32,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
|
|||||||
import java.util.function.Predicate;
|
import java.util.function.Predicate;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import org.l2jmobius.Config;
|
import org.l2jmobius.Config;
|
||||||
import org.l2jmobius.commons.database.DatabaseFactory;
|
import org.l2jmobius.commons.database.DatabaseFactory;
|
||||||
@ -629,14 +629,15 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
//@formatter:off
|
final Set<Quest> startingQuests = new HashSet<>();
|
||||||
final Set<Quest> startingQuests = npc.getListeners(EventType.ON_NPC_QUEST_START).stream()
|
for (AbstractEventListener listener : npc.getListeners(EventType.ON_NPC_QUEST_START))
|
||||||
.map(AbstractEventListener::getOwner)
|
{
|
||||||
.filter(Quest.class::isInstance)
|
final Object owner = listener.getOwner();
|
||||||
.map(Quest.class::cast)
|
if (owner instanceof Quest)
|
||||||
.distinct()
|
{
|
||||||
.collect(Collectors.toSet());
|
startingQuests.add((Quest) owner);
|
||||||
//@formatter:on
|
}
|
||||||
|
}
|
||||||
|
|
||||||
final String startConditionHtml = getStartConditionHtml(player, npc);
|
final String startConditionHtml = getStartConditionHtml(player, npc);
|
||||||
if (startingQuests.contains(this) && (startConditionHtml != null))
|
if (startingQuests.contains(this) && (startConditionHtml != null))
|
||||||
|
@ -23,6 +23,7 @@ import java.util.ArrayList;
|
|||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@ -31,7 +32,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
|
|||||||
import java.util.function.Predicate;
|
import java.util.function.Predicate;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import org.l2jmobius.Config;
|
import org.l2jmobius.Config;
|
||||||
import org.l2jmobius.commons.database.DatabaseFactory;
|
import org.l2jmobius.commons.database.DatabaseFactory;
|
||||||
@ -629,14 +629,15 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
//@formatter:off
|
final Set<Quest> startingQuests = new HashSet<>();
|
||||||
final Set<Quest> startingQuests = npc.getListeners(EventType.ON_NPC_QUEST_START).stream()
|
for (AbstractEventListener listener : npc.getListeners(EventType.ON_NPC_QUEST_START))
|
||||||
.map(AbstractEventListener::getOwner)
|
{
|
||||||
.filter(Quest.class::isInstance)
|
final Object owner = listener.getOwner();
|
||||||
.map(Quest.class::cast)
|
if (owner instanceof Quest)
|
||||||
.distinct()
|
{
|
||||||
.collect(Collectors.toSet());
|
startingQuests.add((Quest) owner);
|
||||||
//@formatter:on
|
}
|
||||||
|
}
|
||||||
|
|
||||||
final String startConditionHtml = getStartConditionHtml(player, npc);
|
final String startConditionHtml = getStartConditionHtml(player, npc);
|
||||||
if (startingQuests.contains(this) && (startConditionHtml != null))
|
if (startingQuests.contains(this) && (startConditionHtml != null))
|
||||||
|
@ -23,6 +23,7 @@ import java.util.ArrayList;
|
|||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@ -31,7 +32,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
|
|||||||
import java.util.function.Predicate;
|
import java.util.function.Predicate;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import org.l2jmobius.Config;
|
import org.l2jmobius.Config;
|
||||||
import org.l2jmobius.commons.database.DatabaseFactory;
|
import org.l2jmobius.commons.database.DatabaseFactory;
|
||||||
@ -629,14 +629,15 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
//@formatter:off
|
final Set<Quest> startingQuests = new HashSet<>();
|
||||||
final Set<Quest> startingQuests = npc.getListeners(EventType.ON_NPC_QUEST_START).stream()
|
for (AbstractEventListener listener : npc.getListeners(EventType.ON_NPC_QUEST_START))
|
||||||
.map(AbstractEventListener::getOwner)
|
{
|
||||||
.filter(Quest.class::isInstance)
|
final Object owner = listener.getOwner();
|
||||||
.map(Quest.class::cast)
|
if (owner instanceof Quest)
|
||||||
.distinct()
|
{
|
||||||
.collect(Collectors.toSet());
|
startingQuests.add((Quest) owner);
|
||||||
//@formatter:on
|
}
|
||||||
|
}
|
||||||
|
|
||||||
final String startConditionHtml = getStartConditionHtml(player, npc);
|
final String startConditionHtml = getStartConditionHtml(player, npc);
|
||||||
if (startingQuests.contains(this) && (startConditionHtml != null))
|
if (startingQuests.contains(this) && (startConditionHtml != null))
|
||||||
|
@ -23,6 +23,7 @@ import java.util.ArrayList;
|
|||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@ -31,7 +32,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
|
|||||||
import java.util.function.Predicate;
|
import java.util.function.Predicate;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import org.l2jmobius.Config;
|
import org.l2jmobius.Config;
|
||||||
import org.l2jmobius.commons.database.DatabaseFactory;
|
import org.l2jmobius.commons.database.DatabaseFactory;
|
||||||
@ -629,14 +629,15 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
//@formatter:off
|
final Set<Quest> startingQuests = new HashSet<>();
|
||||||
final Set<Quest> startingQuests = npc.getListeners(EventType.ON_NPC_QUEST_START).stream()
|
for (AbstractEventListener listener : npc.getListeners(EventType.ON_NPC_QUEST_START))
|
||||||
.map(AbstractEventListener::getOwner)
|
{
|
||||||
.filter(Quest.class::isInstance)
|
final Object owner = listener.getOwner();
|
||||||
.map(Quest.class::cast)
|
if (owner instanceof Quest)
|
||||||
.distinct()
|
{
|
||||||
.collect(Collectors.toSet());
|
startingQuests.add((Quest) owner);
|
||||||
//@formatter:on
|
}
|
||||||
|
}
|
||||||
|
|
||||||
final String startConditionHtml = getStartConditionHtml(player, npc);
|
final String startConditionHtml = getStartConditionHtml(player, npc);
|
||||||
if (startingQuests.contains(this) && (startConditionHtml != null))
|
if (startingQuests.contains(this) && (startConditionHtml != null))
|
||||||
|
@ -23,6 +23,7 @@ import java.util.ArrayList;
|
|||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@ -31,7 +32,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
|
|||||||
import java.util.function.Predicate;
|
import java.util.function.Predicate;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import org.l2jmobius.Config;
|
import org.l2jmobius.Config;
|
||||||
import org.l2jmobius.commons.database.DatabaseFactory;
|
import org.l2jmobius.commons.database.DatabaseFactory;
|
||||||
@ -629,14 +629,15 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
//@formatter:off
|
final Set<Quest> startingQuests = new HashSet<>();
|
||||||
final Set<Quest> startingQuests = npc.getListeners(EventType.ON_NPC_QUEST_START).stream()
|
for (AbstractEventListener listener : npc.getListeners(EventType.ON_NPC_QUEST_START))
|
||||||
.map(AbstractEventListener::getOwner)
|
{
|
||||||
.filter(Quest.class::isInstance)
|
final Object owner = listener.getOwner();
|
||||||
.map(Quest.class::cast)
|
if (owner instanceof Quest)
|
||||||
.distinct()
|
{
|
||||||
.collect(Collectors.toSet());
|
startingQuests.add((Quest) owner);
|
||||||
//@formatter:on
|
}
|
||||||
|
}
|
||||||
|
|
||||||
final String startConditionHtml = getStartConditionHtml(player, npc);
|
final String startConditionHtml = getStartConditionHtml(player, npc);
|
||||||
if (startingQuests.contains(this) && (startConditionHtml != null))
|
if (startingQuests.contains(this) && (startConditionHtml != null))
|
||||||
|
@ -23,6 +23,7 @@ import java.util.ArrayList;
|
|||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@ -31,7 +32,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
|
|||||||
import java.util.function.Predicate;
|
import java.util.function.Predicate;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import org.l2jmobius.Config;
|
import org.l2jmobius.Config;
|
||||||
import org.l2jmobius.commons.database.DatabaseFactory;
|
import org.l2jmobius.commons.database.DatabaseFactory;
|
||||||
@ -639,14 +639,15 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
//@formatter:off
|
final Set<Quest> startingQuests = new HashSet<>();
|
||||||
final Set<Quest> startingQuests = npc.getListeners(EventType.ON_NPC_QUEST_START).stream()
|
for (AbstractEventListener listener : npc.getListeners(EventType.ON_NPC_QUEST_START))
|
||||||
.map(AbstractEventListener::getOwner)
|
{
|
||||||
.filter(Quest.class::isInstance)
|
final Object owner = listener.getOwner();
|
||||||
.map(Quest.class::cast)
|
if (owner instanceof Quest)
|
||||||
.distinct()
|
{
|
||||||
.collect(Collectors.toSet());
|
startingQuests.add((Quest) owner);
|
||||||
//@formatter:on
|
}
|
||||||
|
}
|
||||||
|
|
||||||
final String startConditionHtml = getStartConditionHtml(player, npc);
|
final String startConditionHtml = getStartConditionHtml(player, npc);
|
||||||
if (startingQuests.contains(this) && (startConditionHtml != null))
|
if (startingQuests.contains(this) && (startConditionHtml != null))
|
||||||
|
@ -23,6 +23,7 @@ import java.util.ArrayList;
|
|||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@ -31,7 +32,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
|
|||||||
import java.util.function.Predicate;
|
import java.util.function.Predicate;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import org.l2jmobius.Config;
|
import org.l2jmobius.Config;
|
||||||
import org.l2jmobius.commons.database.DatabaseFactory;
|
import org.l2jmobius.commons.database.DatabaseFactory;
|
||||||
@ -639,14 +639,15 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
//@formatter:off
|
final Set<Quest> startingQuests = new HashSet<>();
|
||||||
final Set<Quest> startingQuests = npc.getListeners(EventType.ON_NPC_QUEST_START).stream()
|
for (AbstractEventListener listener : npc.getListeners(EventType.ON_NPC_QUEST_START))
|
||||||
.map(AbstractEventListener::getOwner)
|
{
|
||||||
.filter(Quest.class::isInstance)
|
final Object owner = listener.getOwner();
|
||||||
.map(Quest.class::cast)
|
if (owner instanceof Quest)
|
||||||
.distinct()
|
{
|
||||||
.collect(Collectors.toSet());
|
startingQuests.add((Quest) owner);
|
||||||
//@formatter:on
|
}
|
||||||
|
}
|
||||||
|
|
||||||
final String startConditionHtml = getStartConditionHtml(player, npc);
|
final String startConditionHtml = getStartConditionHtml(player, npc);
|
||||||
if (startingQuests.contains(this) && (startConditionHtml != null))
|
if (startingQuests.contains(this) && (startConditionHtml != null))
|
||||||
|
@ -23,6 +23,7 @@ import java.util.ArrayList;
|
|||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@ -31,7 +32,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
|
|||||||
import java.util.function.Predicate;
|
import java.util.function.Predicate;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import org.l2jmobius.Config;
|
import org.l2jmobius.Config;
|
||||||
import org.l2jmobius.commons.database.DatabaseFactory;
|
import org.l2jmobius.commons.database.DatabaseFactory;
|
||||||
@ -639,14 +639,15 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
//@formatter:off
|
final Set<Quest> startingQuests = new HashSet<>();
|
||||||
final Set<Quest> startingQuests = npc.getListeners(EventType.ON_NPC_QUEST_START).stream()
|
for (AbstractEventListener listener : npc.getListeners(EventType.ON_NPC_QUEST_START))
|
||||||
.map(AbstractEventListener::getOwner)
|
{
|
||||||
.filter(Quest.class::isInstance)
|
final Object owner = listener.getOwner();
|
||||||
.map(Quest.class::cast)
|
if (owner instanceof Quest)
|
||||||
.distinct()
|
{
|
||||||
.collect(Collectors.toSet());
|
startingQuests.add((Quest) owner);
|
||||||
//@formatter:on
|
}
|
||||||
|
}
|
||||||
|
|
||||||
final String startConditionHtml = getStartConditionHtml(player, npc);
|
final String startConditionHtml = getStartConditionHtml(player, npc);
|
||||||
if (startingQuests.contains(this) && (startConditionHtml != null))
|
if (startingQuests.contains(this) && (startConditionHtml != null))
|
||||||
|
@ -23,6 +23,7 @@ import java.util.ArrayList;
|
|||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@ -31,7 +32,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
|
|||||||
import java.util.function.Predicate;
|
import java.util.function.Predicate;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import org.l2jmobius.Config;
|
import org.l2jmobius.Config;
|
||||||
import org.l2jmobius.commons.database.DatabaseFactory;
|
import org.l2jmobius.commons.database.DatabaseFactory;
|
||||||
@ -634,14 +634,15 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
//@formatter:off
|
final Set<Quest> startingQuests = new HashSet<>();
|
||||||
final Set<Quest> startingQuests = npc.getListeners(EventType.ON_NPC_QUEST_START).stream()
|
for (AbstractEventListener listener : npc.getListeners(EventType.ON_NPC_QUEST_START))
|
||||||
.map(AbstractEventListener::getOwner)
|
{
|
||||||
.filter(Quest.class::isInstance)
|
final Object owner = listener.getOwner();
|
||||||
.map(Quest.class::cast)
|
if (owner instanceof Quest)
|
||||||
.distinct()
|
{
|
||||||
.collect(Collectors.toSet());
|
startingQuests.add((Quest) owner);
|
||||||
//@formatter:on
|
}
|
||||||
|
}
|
||||||
|
|
||||||
final String startConditionHtml = getStartConditionHtml(player, npc);
|
final String startConditionHtml = getStartConditionHtml(player, npc);
|
||||||
if (startingQuests.contains(this) && (startConditionHtml != null))
|
if (startingQuests.contains(this) && (startConditionHtml != null))
|
||||||
|
@ -23,6 +23,7 @@ import java.util.ArrayList;
|
|||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@ -31,7 +32,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
|
|||||||
import java.util.function.Predicate;
|
import java.util.function.Predicate;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import org.l2jmobius.Config;
|
import org.l2jmobius.Config;
|
||||||
import org.l2jmobius.commons.database.DatabaseFactory;
|
import org.l2jmobius.commons.database.DatabaseFactory;
|
||||||
@ -634,14 +634,15 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
//@formatter:off
|
final Set<Quest> startingQuests = new HashSet<>();
|
||||||
final Set<Quest> startingQuests = npc.getListeners(EventType.ON_NPC_QUEST_START).stream()
|
for (AbstractEventListener listener : npc.getListeners(EventType.ON_NPC_QUEST_START))
|
||||||
.map(AbstractEventListener::getOwner)
|
{
|
||||||
.filter(Quest.class::isInstance)
|
final Object owner = listener.getOwner();
|
||||||
.map(Quest.class::cast)
|
if (owner instanceof Quest)
|
||||||
.distinct()
|
{
|
||||||
.collect(Collectors.toSet());
|
startingQuests.add((Quest) owner);
|
||||||
//@formatter:on
|
}
|
||||||
|
}
|
||||||
|
|
||||||
final String startConditionHtml = getStartConditionHtml(player, npc);
|
final String startConditionHtml = getStartConditionHtml(player, npc);
|
||||||
if (startingQuests.contains(this) && (startConditionHtml != null))
|
if (startingQuests.contains(this) && (startConditionHtml != null))
|
||||||
|
@ -23,6 +23,7 @@ import java.util.ArrayList;
|
|||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@ -31,7 +32,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
|
|||||||
import java.util.function.Predicate;
|
import java.util.function.Predicate;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import org.l2jmobius.Config;
|
import org.l2jmobius.Config;
|
||||||
import org.l2jmobius.commons.database.DatabaseFactory;
|
import org.l2jmobius.commons.database.DatabaseFactory;
|
||||||
@ -627,14 +627,15 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
//@formatter:off
|
final Set<Quest> startingQuests = new HashSet<>();
|
||||||
final Set<Quest> startingQuests = npc.getListeners(EventType.ON_NPC_QUEST_START).stream()
|
for (AbstractEventListener listener : npc.getListeners(EventType.ON_NPC_QUEST_START))
|
||||||
.map(AbstractEventListener::getOwner)
|
{
|
||||||
.filter(Quest.class::isInstance)
|
final Object owner = listener.getOwner();
|
||||||
.map(Quest.class::cast)
|
if (owner instanceof Quest)
|
||||||
.distinct()
|
{
|
||||||
.collect(Collectors.toSet());
|
startingQuests.add((Quest) owner);
|
||||||
//@formatter:on
|
}
|
||||||
|
}
|
||||||
|
|
||||||
final String startConditionHtml = getStartConditionHtml(player, npc);
|
final String startConditionHtml = getStartConditionHtml(player, npc);
|
||||||
if (startingQuests.contains(this) && (startConditionHtml != null))
|
if (startingQuests.contains(this) && (startConditionHtml != null))
|
||||||
|
@ -23,6 +23,7 @@ import java.util.ArrayList;
|
|||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@ -31,7 +32,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
|
|||||||
import java.util.function.Predicate;
|
import java.util.function.Predicate;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import org.l2jmobius.Config;
|
import org.l2jmobius.Config;
|
||||||
import org.l2jmobius.commons.database.DatabaseFactory;
|
import org.l2jmobius.commons.database.DatabaseFactory;
|
||||||
@ -627,14 +627,15 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
//@formatter:off
|
final Set<Quest> startingQuests = new HashSet<>();
|
||||||
final Set<Quest> startingQuests = npc.getListeners(EventType.ON_NPC_QUEST_START).stream()
|
for (AbstractEventListener listener : npc.getListeners(EventType.ON_NPC_QUEST_START))
|
||||||
.map(AbstractEventListener::getOwner)
|
{
|
||||||
.filter(Quest.class::isInstance)
|
final Object owner = listener.getOwner();
|
||||||
.map(Quest.class::cast)
|
if (owner instanceof Quest)
|
||||||
.distinct()
|
{
|
||||||
.collect(Collectors.toSet());
|
startingQuests.add((Quest) owner);
|
||||||
//@formatter:on
|
}
|
||||||
|
}
|
||||||
|
|
||||||
final String startConditionHtml = getStartConditionHtml(player, npc);
|
final String startConditionHtml = getStartConditionHtml(player, npc);
|
||||||
if (startingQuests.contains(this) && (startConditionHtml != null))
|
if (startingQuests.contains(this) && (startConditionHtml != null))
|
||||||
|
@ -23,6 +23,7 @@ import java.util.ArrayList;
|
|||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@ -31,7 +32,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
|
|||||||
import java.util.function.Predicate;
|
import java.util.function.Predicate;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import org.l2jmobius.Config;
|
import org.l2jmobius.Config;
|
||||||
import org.l2jmobius.commons.database.DatabaseFactory;
|
import org.l2jmobius.commons.database.DatabaseFactory;
|
||||||
@ -627,14 +627,15 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
//@formatter:off
|
final Set<Quest> startingQuests = new HashSet<>();
|
||||||
final Set<Quest> startingQuests = npc.getListeners(EventType.ON_NPC_QUEST_START).stream()
|
for (AbstractEventListener listener : npc.getListeners(EventType.ON_NPC_QUEST_START))
|
||||||
.map(AbstractEventListener::getOwner)
|
{
|
||||||
.filter(Quest.class::isInstance)
|
final Object owner = listener.getOwner();
|
||||||
.map(Quest.class::cast)
|
if (owner instanceof Quest)
|
||||||
.distinct()
|
{
|
||||||
.collect(Collectors.toSet());
|
startingQuests.add((Quest) owner);
|
||||||
//@formatter:on
|
}
|
||||||
|
}
|
||||||
|
|
||||||
final String startConditionHtml = getStartConditionHtml(player, npc);
|
final String startConditionHtml = getStartConditionHtml(player, npc);
|
||||||
if (startingQuests.contains(this) && (startConditionHtml != null))
|
if (startingQuests.contains(this) && (startConditionHtml != null))
|
||||||
|
@ -23,6 +23,7 @@ import java.util.ArrayList;
|
|||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@ -31,7 +32,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
|
|||||||
import java.util.function.Predicate;
|
import java.util.function.Predicate;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import org.l2jmobius.Config;
|
import org.l2jmobius.Config;
|
||||||
import org.l2jmobius.commons.database.DatabaseFactory;
|
import org.l2jmobius.commons.database.DatabaseFactory;
|
||||||
@ -627,14 +627,15 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
//@formatter:off
|
final Set<Quest> startingQuests = new HashSet<>();
|
||||||
final Set<Quest> startingQuests = npc.getListeners(EventType.ON_NPC_QUEST_START).stream()
|
for (AbstractEventListener listener : npc.getListeners(EventType.ON_NPC_QUEST_START))
|
||||||
.map(AbstractEventListener::getOwner)
|
{
|
||||||
.filter(Quest.class::isInstance)
|
final Object owner = listener.getOwner();
|
||||||
.map(Quest.class::cast)
|
if (owner instanceof Quest)
|
||||||
.distinct()
|
{
|
||||||
.collect(Collectors.toSet());
|
startingQuests.add((Quest) owner);
|
||||||
//@formatter:on
|
}
|
||||||
|
}
|
||||||
|
|
||||||
final String startConditionHtml = getStartConditionHtml(player, npc);
|
final String startConditionHtml = getStartConditionHtml(player, npc);
|
||||||
if (startingQuests.contains(this) && (startConditionHtml != null))
|
if (startingQuests.contains(this) && (startConditionHtml != null))
|
||||||
|
@ -23,6 +23,7 @@ import java.util.ArrayList;
|
|||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@ -31,7 +32,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
|
|||||||
import java.util.function.Predicate;
|
import java.util.function.Predicate;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import org.l2jmobius.Config;
|
import org.l2jmobius.Config;
|
||||||
import org.l2jmobius.commons.database.DatabaseFactory;
|
import org.l2jmobius.commons.database.DatabaseFactory;
|
||||||
@ -627,14 +627,15 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
//@formatter:off
|
final Set<Quest> startingQuests = new HashSet<>();
|
||||||
final Set<Quest> startingQuests = npc.getListeners(EventType.ON_NPC_QUEST_START).stream()
|
for (AbstractEventListener listener : npc.getListeners(EventType.ON_NPC_QUEST_START))
|
||||||
.map(AbstractEventListener::getOwner)
|
{
|
||||||
.filter(Quest.class::isInstance)
|
final Object owner = listener.getOwner();
|
||||||
.map(Quest.class::cast)
|
if (owner instanceof Quest)
|
||||||
.distinct()
|
{
|
||||||
.collect(Collectors.toSet());
|
startingQuests.add((Quest) owner);
|
||||||
//@formatter:on
|
}
|
||||||
|
}
|
||||||
|
|
||||||
final String startConditionHtml = getStartConditionHtml(player, npc);
|
final String startConditionHtml = getStartConditionHtml(player, npc);
|
||||||
if (startingQuests.contains(this) && (startConditionHtml != null))
|
if (startingQuests.contains(this) && (startConditionHtml != null))
|
||||||
|
@ -23,6 +23,7 @@ import java.util.ArrayList;
|
|||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@ -31,7 +32,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
|
|||||||
import java.util.function.Predicate;
|
import java.util.function.Predicate;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import org.l2jmobius.Config;
|
import org.l2jmobius.Config;
|
||||||
import org.l2jmobius.commons.database.DatabaseFactory;
|
import org.l2jmobius.commons.database.DatabaseFactory;
|
||||||
@ -627,14 +627,15 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
//@formatter:off
|
final Set<Quest> startingQuests = new HashSet<>();
|
||||||
final Set<Quest> startingQuests = npc.getListeners(EventType.ON_NPC_QUEST_START).stream()
|
for (AbstractEventListener listener : npc.getListeners(EventType.ON_NPC_QUEST_START))
|
||||||
.map(AbstractEventListener::getOwner)
|
{
|
||||||
.filter(Quest.class::isInstance)
|
final Object owner = listener.getOwner();
|
||||||
.map(Quest.class::cast)
|
if (owner instanceof Quest)
|
||||||
.distinct()
|
{
|
||||||
.collect(Collectors.toSet());
|
startingQuests.add((Quest) owner);
|
||||||
//@formatter:on
|
}
|
||||||
|
}
|
||||||
|
|
||||||
final String startConditionHtml = getStartConditionHtml(player, npc);
|
final String startConditionHtml = getStartConditionHtml(player, npc);
|
||||||
if (startingQuests.contains(this) && (startConditionHtml != null))
|
if (startingQuests.contains(this) && (startConditionHtml != null))
|
||||||
|
@ -23,6 +23,7 @@ import java.util.ArrayList;
|
|||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@ -31,7 +32,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
|
|||||||
import java.util.function.Predicate;
|
import java.util.function.Predicate;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import org.l2jmobius.Config;
|
import org.l2jmobius.Config;
|
||||||
import org.l2jmobius.commons.database.DatabaseFactory;
|
import org.l2jmobius.commons.database.DatabaseFactory;
|
||||||
@ -627,14 +627,15 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
//@formatter:off
|
final Set<Quest> startingQuests = new HashSet<>();
|
||||||
final Set<Quest> startingQuests = npc.getListeners(EventType.ON_NPC_QUEST_START).stream()
|
for (AbstractEventListener listener : npc.getListeners(EventType.ON_NPC_QUEST_START))
|
||||||
.map(AbstractEventListener::getOwner)
|
{
|
||||||
.filter(Quest.class::isInstance)
|
final Object owner = listener.getOwner();
|
||||||
.map(Quest.class::cast)
|
if (owner instanceof Quest)
|
||||||
.distinct()
|
{
|
||||||
.collect(Collectors.toSet());
|
startingQuests.add((Quest) owner);
|
||||||
//@formatter:on
|
}
|
||||||
|
}
|
||||||
|
|
||||||
final String startConditionHtml = getStartConditionHtml(player, npc);
|
final String startConditionHtml = getStartConditionHtml(player, npc);
|
||||||
if (startingQuests.contains(this) && (startConditionHtml != null))
|
if (startingQuests.contains(this) && (startConditionHtml != null))
|
||||||
|
@ -23,6 +23,7 @@ import java.util.ArrayList;
|
|||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@ -31,7 +32,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
|
|||||||
import java.util.function.Predicate;
|
import java.util.function.Predicate;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import org.l2jmobius.Config;
|
import org.l2jmobius.Config;
|
||||||
import org.l2jmobius.commons.database.DatabaseFactory;
|
import org.l2jmobius.commons.database.DatabaseFactory;
|
||||||
@ -627,14 +627,15 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
//@formatter:off
|
final Set<Quest> startingQuests = new HashSet<>();
|
||||||
final Set<Quest> startingQuests = npc.getListeners(EventType.ON_NPC_QUEST_START).stream()
|
for (AbstractEventListener listener : npc.getListeners(EventType.ON_NPC_QUEST_START))
|
||||||
.map(AbstractEventListener::getOwner)
|
{
|
||||||
.filter(Quest.class::isInstance)
|
final Object owner = listener.getOwner();
|
||||||
.map(Quest.class::cast)
|
if (owner instanceof Quest)
|
||||||
.distinct()
|
{
|
||||||
.collect(Collectors.toSet());
|
startingQuests.add((Quest) owner);
|
||||||
//@formatter:on
|
}
|
||||||
|
}
|
||||||
|
|
||||||
final String startConditionHtml = getStartConditionHtml(player, npc);
|
final String startConditionHtml = getStartConditionHtml(player, npc);
|
||||||
if (startingQuests.contains(this) && (startConditionHtml != null))
|
if (startingQuests.contains(this) && (startConditionHtml != null))
|
||||||
|
@ -23,6 +23,7 @@ import java.util.ArrayList;
|
|||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@ -31,7 +32,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
|
|||||||
import java.util.function.Predicate;
|
import java.util.function.Predicate;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import org.l2jmobius.Config;
|
import org.l2jmobius.Config;
|
||||||
import org.l2jmobius.commons.database.DatabaseFactory;
|
import org.l2jmobius.commons.database.DatabaseFactory;
|
||||||
@ -627,14 +627,15 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
//@formatter:off
|
final Set<Quest> startingQuests = new HashSet<>();
|
||||||
final Set<Quest> startingQuests = npc.getListeners(EventType.ON_NPC_QUEST_START).stream()
|
for (AbstractEventListener listener : npc.getListeners(EventType.ON_NPC_QUEST_START))
|
||||||
.map(AbstractEventListener::getOwner)
|
{
|
||||||
.filter(Quest.class::isInstance)
|
final Object owner = listener.getOwner();
|
||||||
.map(Quest.class::cast)
|
if (owner instanceof Quest)
|
||||||
.distinct()
|
{
|
||||||
.collect(Collectors.toSet());
|
startingQuests.add((Quest) owner);
|
||||||
//@formatter:on
|
}
|
||||||
|
}
|
||||||
|
|
||||||
final String startConditionHtml = getStartConditionHtml(player, npc);
|
final String startConditionHtml = getStartConditionHtml(player, npc);
|
||||||
if (startingQuests.contains(this) && (startConditionHtml != null))
|
if (startingQuests.contains(this) && (startConditionHtml != null))
|
||||||
|
@ -23,6 +23,7 @@ import java.util.ArrayList;
|
|||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@ -31,7 +32,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
|
|||||||
import java.util.function.Predicate;
|
import java.util.function.Predicate;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import org.l2jmobius.Config;
|
import org.l2jmobius.Config;
|
||||||
import org.l2jmobius.commons.database.DatabaseFactory;
|
import org.l2jmobius.commons.database.DatabaseFactory;
|
||||||
@ -627,14 +627,15 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
//@formatter:off
|
final Set<Quest> startingQuests = new HashSet<>();
|
||||||
final Set<Quest> startingQuests = npc.getListeners(EventType.ON_NPC_QUEST_START).stream()
|
for (AbstractEventListener listener : npc.getListeners(EventType.ON_NPC_QUEST_START))
|
||||||
.map(AbstractEventListener::getOwner)
|
{
|
||||||
.filter(Quest.class::isInstance)
|
final Object owner = listener.getOwner();
|
||||||
.map(Quest.class::cast)
|
if (owner instanceof Quest)
|
||||||
.distinct()
|
{
|
||||||
.collect(Collectors.toSet());
|
startingQuests.add((Quest) owner);
|
||||||
//@formatter:on
|
}
|
||||||
|
}
|
||||||
|
|
||||||
final String startConditionHtml = getStartConditionHtml(player, npc);
|
final String startConditionHtml = getStartConditionHtml(player, npc);
|
||||||
if (startingQuests.contains(this) && (startConditionHtml != null))
|
if (startingQuests.contains(this) && (startConditionHtml != null))
|
||||||
|
@ -23,6 +23,7 @@ import java.util.ArrayList;
|
|||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@ -31,7 +32,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
|
|||||||
import java.util.function.Predicate;
|
import java.util.function.Predicate;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import org.l2jmobius.Config;
|
import org.l2jmobius.Config;
|
||||||
import org.l2jmobius.commons.database.DatabaseFactory;
|
import org.l2jmobius.commons.database.DatabaseFactory;
|
||||||
@ -634,14 +634,15 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
//@formatter:off
|
final Set<Quest> startingQuests = new HashSet<>();
|
||||||
final Set<Quest> startingQuests = npc.getListeners(EventType.ON_NPC_QUEST_START).stream()
|
for (AbstractEventListener listener : npc.getListeners(EventType.ON_NPC_QUEST_START))
|
||||||
.map(AbstractEventListener::getOwner)
|
{
|
||||||
.filter(Quest.class::isInstance)
|
final Object owner = listener.getOwner();
|
||||||
.map(Quest.class::cast)
|
if (owner instanceof Quest)
|
||||||
.distinct()
|
{
|
||||||
.collect(Collectors.toSet());
|
startingQuests.add((Quest) owner);
|
||||||
//@formatter:on
|
}
|
||||||
|
}
|
||||||
|
|
||||||
final String startConditionHtml = getStartConditionHtml(player, npc);
|
final String startConditionHtml = getStartConditionHtml(player, npc);
|
||||||
if (startingQuests.contains(this) && (startConditionHtml != null))
|
if (startingQuests.contains(this) && (startConditionHtml != null))
|
||||||
|
@ -23,6 +23,7 @@ import java.util.ArrayList;
|
|||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@ -31,7 +32,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
|
|||||||
import java.util.function.Predicate;
|
import java.util.function.Predicate;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import org.l2jmobius.Config;
|
import org.l2jmobius.Config;
|
||||||
import org.l2jmobius.commons.database.DatabaseFactory;
|
import org.l2jmobius.commons.database.DatabaseFactory;
|
||||||
@ -634,14 +634,15 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
//@formatter:off
|
final Set<Quest> startingQuests = new HashSet<>();
|
||||||
final Set<Quest> startingQuests = npc.getListeners(EventType.ON_NPC_QUEST_START).stream()
|
for (AbstractEventListener listener : npc.getListeners(EventType.ON_NPC_QUEST_START))
|
||||||
.map(AbstractEventListener::getOwner)
|
{
|
||||||
.filter(Quest.class::isInstance)
|
final Object owner = listener.getOwner();
|
||||||
.map(Quest.class::cast)
|
if (owner instanceof Quest)
|
||||||
.distinct()
|
{
|
||||||
.collect(Collectors.toSet());
|
startingQuests.add((Quest) owner);
|
||||||
//@formatter:on
|
}
|
||||||
|
}
|
||||||
|
|
||||||
final String startConditionHtml = getStartConditionHtml(player, npc);
|
final String startConditionHtml = getStartConditionHtml(player, npc);
|
||||||
if (startingQuests.contains(this) && (startConditionHtml != null))
|
if (startingQuests.contains(this) && (startConditionHtml != null))
|
||||||
|
@ -23,6 +23,7 @@ import java.util.ArrayList;
|
|||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@ -31,7 +32,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
|
|||||||
import java.util.function.Predicate;
|
import java.util.function.Predicate;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import org.l2jmobius.Config;
|
import org.l2jmobius.Config;
|
||||||
import org.l2jmobius.commons.database.DatabaseFactory;
|
import org.l2jmobius.commons.database.DatabaseFactory;
|
||||||
@ -634,14 +634,15 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
//@formatter:off
|
final Set<Quest> startingQuests = new HashSet<>();
|
||||||
final Set<Quest> startingQuests = npc.getListeners(EventType.ON_NPC_QUEST_START).stream()
|
for (AbstractEventListener listener : npc.getListeners(EventType.ON_NPC_QUEST_START))
|
||||||
.map(AbstractEventListener::getOwner)
|
{
|
||||||
.filter(Quest.class::isInstance)
|
final Object owner = listener.getOwner();
|
||||||
.map(Quest.class::cast)
|
if (owner instanceof Quest)
|
||||||
.distinct()
|
{
|
||||||
.collect(Collectors.toSet());
|
startingQuests.add((Quest) owner);
|
||||||
//@formatter:on
|
}
|
||||||
|
}
|
||||||
|
|
||||||
final String startConditionHtml = getStartConditionHtml(player, npc);
|
final String startConditionHtml = getStartConditionHtml(player, npc);
|
||||||
if (startingQuests.contains(this) && (startConditionHtml != null))
|
if (startingQuests.contains(this) && (startConditionHtml != null))
|
||||||
|
@ -23,6 +23,7 @@ import java.util.ArrayList;
|
|||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@ -31,7 +32,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
|
|||||||
import java.util.function.Predicate;
|
import java.util.function.Predicate;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import org.l2jmobius.Config;
|
import org.l2jmobius.Config;
|
||||||
import org.l2jmobius.commons.database.DatabaseFactory;
|
import org.l2jmobius.commons.database.DatabaseFactory;
|
||||||
@ -634,14 +634,15 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
//@formatter:off
|
final Set<Quest> startingQuests = new HashSet<>();
|
||||||
final Set<Quest> startingQuests = npc.getListeners(EventType.ON_NPC_QUEST_START).stream()
|
for (AbstractEventListener listener : npc.getListeners(EventType.ON_NPC_QUEST_START))
|
||||||
.map(AbstractEventListener::getOwner)
|
{
|
||||||
.filter(Quest.class::isInstance)
|
final Object owner = listener.getOwner();
|
||||||
.map(Quest.class::cast)
|
if (owner instanceof Quest)
|
||||||
.distinct()
|
{
|
||||||
.collect(Collectors.toSet());
|
startingQuests.add((Quest) owner);
|
||||||
//@formatter:on
|
}
|
||||||
|
}
|
||||||
|
|
||||||
final String startConditionHtml = getStartConditionHtml(player, npc);
|
final String startConditionHtml = getStartConditionHtml(player, npc);
|
||||||
if (startingQuests.contains(this) && (startConditionHtml != null))
|
if (startingQuests.contains(this) && (startConditionHtml != null))
|
||||||
|
Loading…
Reference in New Issue
Block a user