Simulated talk should not exist when event runs.
This commit is contained in:
@@ -554,6 +554,11 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
// Simulated talk should not exist when event runs.
|
||||||
|
if (player != null)
|
||||||
|
{
|
||||||
|
player.setSimulatedTalking(false);
|
||||||
|
}
|
||||||
res = onAdvEvent(event, npc, player);
|
res = onAdvEvent(event, npc, player);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
@@ -593,11 +598,16 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
// Simulated talk should not exist when killing.
|
// Simulated talk should not exist when killing.
|
||||||
|
if (killer != null)
|
||||||
|
{
|
||||||
|
killer.setSimulatedTalking(false);
|
||||||
|
|
||||||
final QuestState qs = getQuestState(killer, false);
|
final QuestState qs = getQuestState(killer, false);
|
||||||
if (qs != null)
|
if (qs != null)
|
||||||
{
|
{
|
||||||
qs.setSimulated(false);
|
qs.setSimulated(false);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
res = onKill(npc, killer, isSummon);
|
res = onKill(npc, killer, isSummon);
|
||||||
}
|
}
|
||||||
|
@@ -556,6 +556,11 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
// Simulated talk should not exist when event runs.
|
||||||
|
if (player != null)
|
||||||
|
{
|
||||||
|
player.setSimulatedTalking(false);
|
||||||
|
}
|
||||||
res = onAdvEvent(event, npc, player);
|
res = onAdvEvent(event, npc, player);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
@@ -595,11 +600,16 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
// Simulated talk should not exist when killing.
|
// Simulated talk should not exist when killing.
|
||||||
|
if (killer != null)
|
||||||
|
{
|
||||||
|
killer.setSimulatedTalking(false);
|
||||||
|
|
||||||
final QuestState qs = getQuestState(killer, false);
|
final QuestState qs = getQuestState(killer, false);
|
||||||
if (qs != null)
|
if (qs != null)
|
||||||
{
|
{
|
||||||
qs.setSimulated(false);
|
qs.setSimulated(false);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
res = onKill(npc, killer, isSummon);
|
res = onKill(npc, killer, isSummon);
|
||||||
}
|
}
|
||||||
|
@@ -557,6 +557,11 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
// Simulated talk should not exist when event runs.
|
||||||
|
if (player != null)
|
||||||
|
{
|
||||||
|
player.setSimulatedTalking(false);
|
||||||
|
}
|
||||||
res = onAdvEvent(event, npc, player);
|
res = onAdvEvent(event, npc, player);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
@@ -596,11 +601,16 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
// Simulated talk should not exist when killing.
|
// Simulated talk should not exist when killing.
|
||||||
|
if (killer != null)
|
||||||
|
{
|
||||||
|
killer.setSimulatedTalking(false);
|
||||||
|
|
||||||
final QuestState qs = getQuestState(killer, false);
|
final QuestState qs = getQuestState(killer, false);
|
||||||
if (qs != null)
|
if (qs != null)
|
||||||
{
|
{
|
||||||
qs.setSimulated(false);
|
qs.setSimulated(false);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
res = onKill(npc, killer, isSummon);
|
res = onKill(npc, killer, isSummon);
|
||||||
}
|
}
|
||||||
|
@@ -557,6 +557,11 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
// Simulated talk should not exist when event runs.
|
||||||
|
if (player != null)
|
||||||
|
{
|
||||||
|
player.setSimulatedTalking(false);
|
||||||
|
}
|
||||||
res = onAdvEvent(event, npc, player);
|
res = onAdvEvent(event, npc, player);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
@@ -596,11 +601,16 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
// Simulated talk should not exist when killing.
|
// Simulated talk should not exist when killing.
|
||||||
|
if (killer != null)
|
||||||
|
{
|
||||||
|
killer.setSimulatedTalking(false);
|
||||||
|
|
||||||
final QuestState qs = getQuestState(killer, false);
|
final QuestState qs = getQuestState(killer, false);
|
||||||
if (qs != null)
|
if (qs != null)
|
||||||
{
|
{
|
||||||
qs.setSimulated(false);
|
qs.setSimulated(false);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
res = onKill(npc, killer, isSummon);
|
res = onKill(npc, killer, isSummon);
|
||||||
}
|
}
|
||||||
|
@@ -557,6 +557,11 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
// Simulated talk should not exist when event runs.
|
||||||
|
if (player != null)
|
||||||
|
{
|
||||||
|
player.setSimulatedTalking(false);
|
||||||
|
}
|
||||||
res = onAdvEvent(event, npc, player);
|
res = onAdvEvent(event, npc, player);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
@@ -596,11 +601,16 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
// Simulated talk should not exist when killing.
|
// Simulated talk should not exist when killing.
|
||||||
|
if (killer != null)
|
||||||
|
{
|
||||||
|
killer.setSimulatedTalking(false);
|
||||||
|
|
||||||
final QuestState qs = getQuestState(killer, false);
|
final QuestState qs = getQuestState(killer, false);
|
||||||
if (qs != null)
|
if (qs != null)
|
||||||
{
|
{
|
||||||
qs.setSimulated(false);
|
qs.setSimulated(false);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
res = onKill(npc, killer, isSummon);
|
res = onKill(npc, killer, isSummon);
|
||||||
}
|
}
|
||||||
|
@@ -557,6 +557,11 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
// Simulated talk should not exist when event runs.
|
||||||
|
if (player != null)
|
||||||
|
{
|
||||||
|
player.setSimulatedTalking(false);
|
||||||
|
}
|
||||||
res = onAdvEvent(event, npc, player);
|
res = onAdvEvent(event, npc, player);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
@@ -596,11 +601,16 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
// Simulated talk should not exist when killing.
|
// Simulated talk should not exist when killing.
|
||||||
|
if (killer != null)
|
||||||
|
{
|
||||||
|
killer.setSimulatedTalking(false);
|
||||||
|
|
||||||
final QuestState qs = getQuestState(killer, false);
|
final QuestState qs = getQuestState(killer, false);
|
||||||
if (qs != null)
|
if (qs != null)
|
||||||
{
|
{
|
||||||
qs.setSimulated(false);
|
qs.setSimulated(false);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
res = onKill(npc, killer, isSummon);
|
res = onKill(npc, killer, isSummon);
|
||||||
}
|
}
|
||||||
|
@@ -557,6 +557,11 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
// Simulated talk should not exist when event runs.
|
||||||
|
if (player != null)
|
||||||
|
{
|
||||||
|
player.setSimulatedTalking(false);
|
||||||
|
}
|
||||||
res = onAdvEvent(event, npc, player);
|
res = onAdvEvent(event, npc, player);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
@@ -596,11 +601,16 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
// Simulated talk should not exist when killing.
|
// Simulated talk should not exist when killing.
|
||||||
|
if (killer != null)
|
||||||
|
{
|
||||||
|
killer.setSimulatedTalking(false);
|
||||||
|
|
||||||
final QuestState qs = getQuestState(killer, false);
|
final QuestState qs = getQuestState(killer, false);
|
||||||
if (qs != null)
|
if (qs != null)
|
||||||
{
|
{
|
||||||
qs.setSimulated(false);
|
qs.setSimulated(false);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
res = onKill(npc, killer, isSummon);
|
res = onKill(npc, killer, isSummon);
|
||||||
}
|
}
|
||||||
|
@@ -567,6 +567,11 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
// Simulated talk should not exist when event runs.
|
||||||
|
if (player != null)
|
||||||
|
{
|
||||||
|
player.setSimulatedTalking(false);
|
||||||
|
}
|
||||||
res = onAdvEvent(event, npc, player);
|
res = onAdvEvent(event, npc, player);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
@@ -606,11 +611,16 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
// Simulated talk should not exist when killing.
|
// Simulated talk should not exist when killing.
|
||||||
|
if (killer != null)
|
||||||
|
{
|
||||||
|
killer.setSimulatedTalking(false);
|
||||||
|
|
||||||
final QuestState qs = getQuestState(killer, false);
|
final QuestState qs = getQuestState(killer, false);
|
||||||
if (qs != null)
|
if (qs != null)
|
||||||
{
|
{
|
||||||
qs.setSimulated(false);
|
qs.setSimulated(false);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
res = onKill(npc, killer, isSummon);
|
res = onKill(npc, killer, isSummon);
|
||||||
}
|
}
|
||||||
|
@@ -567,6 +567,11 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
// Simulated talk should not exist when event runs.
|
||||||
|
if (player != null)
|
||||||
|
{
|
||||||
|
player.setSimulatedTalking(false);
|
||||||
|
}
|
||||||
res = onAdvEvent(event, npc, player);
|
res = onAdvEvent(event, npc, player);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
@@ -606,11 +611,16 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
// Simulated talk should not exist when killing.
|
// Simulated talk should not exist when killing.
|
||||||
|
if (killer != null)
|
||||||
|
{
|
||||||
|
killer.setSimulatedTalking(false);
|
||||||
|
|
||||||
final QuestState qs = getQuestState(killer, false);
|
final QuestState qs = getQuestState(killer, false);
|
||||||
if (qs != null)
|
if (qs != null)
|
||||||
{
|
{
|
||||||
qs.setSimulated(false);
|
qs.setSimulated(false);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
res = onKill(npc, killer, isSummon);
|
res = onKill(npc, killer, isSummon);
|
||||||
}
|
}
|
||||||
|
@@ -555,6 +555,11 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
// Simulated talk should not exist when event runs.
|
||||||
|
if (player != null)
|
||||||
|
{
|
||||||
|
player.setSimulatedTalking(false);
|
||||||
|
}
|
||||||
res = onAdvEvent(event, npc, player);
|
res = onAdvEvent(event, npc, player);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
@@ -594,11 +599,16 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
// Simulated talk should not exist when killing.
|
// Simulated talk should not exist when killing.
|
||||||
|
if (killer != null)
|
||||||
|
{
|
||||||
|
killer.setSimulatedTalking(false);
|
||||||
|
|
||||||
final QuestState qs = getQuestState(killer, false);
|
final QuestState qs = getQuestState(killer, false);
|
||||||
if (qs != null)
|
if (qs != null)
|
||||||
{
|
{
|
||||||
qs.setSimulated(false);
|
qs.setSimulated(false);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
res = onKill(npc, killer, isSummon);
|
res = onKill(npc, killer, isSummon);
|
||||||
}
|
}
|
||||||
|
@@ -555,6 +555,11 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
// Simulated talk should not exist when event runs.
|
||||||
|
if (player != null)
|
||||||
|
{
|
||||||
|
player.setSimulatedTalking(false);
|
||||||
|
}
|
||||||
res = onAdvEvent(event, npc, player);
|
res = onAdvEvent(event, npc, player);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
@@ -594,11 +599,16 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
// Simulated talk should not exist when killing.
|
// Simulated talk should not exist when killing.
|
||||||
|
if (killer != null)
|
||||||
|
{
|
||||||
|
killer.setSimulatedTalking(false);
|
||||||
|
|
||||||
final QuestState qs = getQuestState(killer, false);
|
final QuestState qs = getQuestState(killer, false);
|
||||||
if (qs != null)
|
if (qs != null)
|
||||||
{
|
{
|
||||||
qs.setSimulated(false);
|
qs.setSimulated(false);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
res = onKill(npc, killer, isSummon);
|
res = onKill(npc, killer, isSummon);
|
||||||
}
|
}
|
||||||
|
@@ -555,6 +555,11 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
// Simulated talk should not exist when event runs.
|
||||||
|
if (player != null)
|
||||||
|
{
|
||||||
|
player.setSimulatedTalking(false);
|
||||||
|
}
|
||||||
res = onAdvEvent(event, npc, player);
|
res = onAdvEvent(event, npc, player);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
@@ -594,11 +599,16 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
// Simulated talk should not exist when killing.
|
// Simulated talk should not exist when killing.
|
||||||
|
if (killer != null)
|
||||||
|
{
|
||||||
|
killer.setSimulatedTalking(false);
|
||||||
|
|
||||||
final QuestState qs = getQuestState(killer, false);
|
final QuestState qs = getQuestState(killer, false);
|
||||||
if (qs != null)
|
if (qs != null)
|
||||||
{
|
{
|
||||||
qs.setSimulated(false);
|
qs.setSimulated(false);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
res = onKill(npc, killer, isSummon);
|
res = onKill(npc, killer, isSummon);
|
||||||
}
|
}
|
||||||
|
@@ -555,6 +555,11 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
// Simulated talk should not exist when event runs.
|
||||||
|
if (player != null)
|
||||||
|
{
|
||||||
|
player.setSimulatedTalking(false);
|
||||||
|
}
|
||||||
res = onAdvEvent(event, npc, player);
|
res = onAdvEvent(event, npc, player);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
@@ -594,11 +599,16 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
// Simulated talk should not exist when killing.
|
// Simulated talk should not exist when killing.
|
||||||
|
if (killer != null)
|
||||||
|
{
|
||||||
|
killer.setSimulatedTalking(false);
|
||||||
|
|
||||||
final QuestState qs = getQuestState(killer, false);
|
final QuestState qs = getQuestState(killer, false);
|
||||||
if (qs != null)
|
if (qs != null)
|
||||||
{
|
{
|
||||||
qs.setSimulated(false);
|
qs.setSimulated(false);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
res = onKill(npc, killer, isSummon);
|
res = onKill(npc, killer, isSummon);
|
||||||
}
|
}
|
||||||
|
@@ -555,6 +555,11 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
// Simulated talk should not exist when event runs.
|
||||||
|
if (player != null)
|
||||||
|
{
|
||||||
|
player.setSimulatedTalking(false);
|
||||||
|
}
|
||||||
res = onAdvEvent(event, npc, player);
|
res = onAdvEvent(event, npc, player);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
@@ -594,11 +599,16 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
// Simulated talk should not exist when killing.
|
// Simulated talk should not exist when killing.
|
||||||
|
if (killer != null)
|
||||||
|
{
|
||||||
|
killer.setSimulatedTalking(false);
|
||||||
|
|
||||||
final QuestState qs = getQuestState(killer, false);
|
final QuestState qs = getQuestState(killer, false);
|
||||||
if (qs != null)
|
if (qs != null)
|
||||||
{
|
{
|
||||||
qs.setSimulated(false);
|
qs.setSimulated(false);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
res = onKill(npc, killer, isSummon);
|
res = onKill(npc, killer, isSummon);
|
||||||
}
|
}
|
||||||
|
@@ -555,6 +555,11 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
// Simulated talk should not exist when event runs.
|
||||||
|
if (player != null)
|
||||||
|
{
|
||||||
|
player.setSimulatedTalking(false);
|
||||||
|
}
|
||||||
res = onAdvEvent(event, npc, player);
|
res = onAdvEvent(event, npc, player);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
@@ -594,11 +599,16 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
// Simulated talk should not exist when killing.
|
// Simulated talk should not exist when killing.
|
||||||
|
if (killer != null)
|
||||||
|
{
|
||||||
|
killer.setSimulatedTalking(false);
|
||||||
|
|
||||||
final QuestState qs = getQuestState(killer, false);
|
final QuestState qs = getQuestState(killer, false);
|
||||||
if (qs != null)
|
if (qs != null)
|
||||||
{
|
{
|
||||||
qs.setSimulated(false);
|
qs.setSimulated(false);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
res = onKill(npc, killer, isSummon);
|
res = onKill(npc, killer, isSummon);
|
||||||
}
|
}
|
||||||
|
@@ -555,6 +555,11 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
// Simulated talk should not exist when event runs.
|
||||||
|
if (player != null)
|
||||||
|
{
|
||||||
|
player.setSimulatedTalking(false);
|
||||||
|
}
|
||||||
res = onAdvEvent(event, npc, player);
|
res = onAdvEvent(event, npc, player);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
@@ -594,11 +599,16 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
// Simulated talk should not exist when killing.
|
// Simulated talk should not exist when killing.
|
||||||
|
if (killer != null)
|
||||||
|
{
|
||||||
|
killer.setSimulatedTalking(false);
|
||||||
|
|
||||||
final QuestState qs = getQuestState(killer, false);
|
final QuestState qs = getQuestState(killer, false);
|
||||||
if (qs != null)
|
if (qs != null)
|
||||||
{
|
{
|
||||||
qs.setSimulated(false);
|
qs.setSimulated(false);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
res = onKill(npc, killer, isSummon);
|
res = onKill(npc, killer, isSummon);
|
||||||
}
|
}
|
||||||
|
@@ -562,6 +562,11 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
String res = null;
|
String res = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
// Simulated talk should not exist when event runs.
|
||||||
|
if (player != null)
|
||||||
|
{
|
||||||
|
player.setSimulatedTalking(false);
|
||||||
|
}
|
||||||
res = onAdvEvent(event, npc, player);
|
res = onAdvEvent(event, npc, player);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
@@ -601,11 +606,16 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
// Simulated talk should not exist when killing.
|
// Simulated talk should not exist when killing.
|
||||||
|
if (killer != null)
|
||||||
|
{
|
||||||
|
killer.setSimulatedTalking(false);
|
||||||
|
|
||||||
final QuestState qs = getQuestState(killer, false);
|
final QuestState qs = getQuestState(killer, false);
|
||||||
if (qs != null)
|
if (qs != null)
|
||||||
{
|
{
|
||||||
qs.setSimulated(false);
|
qs.setSimulated(false);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
res = onKill(npc, killer, isSummon);
|
res = onKill(npc, killer, isSummon);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user