From 4b883116b43858a73712c0bd530f015879118bfb Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 14 Aug 2017 14:39:33 +0000
Subject: [PATCH] Fixed museum dungeon dwarf issue.

---
 .../MuseumDungeon/MuseumDungeon.java          | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java b/L2J_Mobius_Helios/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java
index 294cf9b456..6a25c1827a 100644
--- a/L2J_Mobius_Helios/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java
+++ b/L2J_Mobius_Helios/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java
@@ -19,11 +19,13 @@ package instances.MuseumDungeon;
 import java.util.List;
 
 import com.l2jmobius.gameserver.enums.ChatType;
+import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.L2Attackable;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.model.actor.instance.L2QuestGuardInstance;
 import com.l2jmobius.gameserver.model.events.EventType;
 import com.l2jmobius.gameserver.model.events.ListenerRegisterType;
 import com.l2jmobius.gameserver.model.events.annotations.Id;
@@ -75,6 +77,7 @@ public final class MuseumDungeon extends AbstractInstance
 		addFirstTalkId(DESK);
 		addTalkId(SHANNON, TOYRON);
 		addAttackId(THIEF);
+		addSkillSeeId(THIEF);
 	}
 	
 	@Override
@@ -144,6 +147,19 @@ public final class MuseumDungeon extends AbstractInstance
 		return onAttack(npc, attacker, damage, isSummon);
 	}
 	
+	@Override
+	public String onSkillSee(L2Npc npc, L2PcInstance caster, Skill skill, L2Object[] targets, boolean isSummon)
+	{
+		if (npc.isScriptValue(0) && (skill == SPOIL.getSkill()) && (caster.getTarget() == npc) && (npc.calculateDistance(caster, false, false) < 200))
+		{
+			final L2Npc toyron = npc.getInstanceWorld().getNpc(TOYRON);
+			((L2QuestGuardInstance) toyron).addDamageHate(npc, 0, 9999); // TODO: Find better way for attack
+			npc.reduceCurrentHp(1, toyron, null);
+			npc.setScriptValue(1);
+		}
+		return super.onSkillSee(npc, caster, skill, targets, isSummon);
+	}
+	
 	@Override
 	public void onTimerEvent(String event, StatsSet params, L2Npc npc, L2PcInstance player)
 	{
@@ -232,19 +248,12 @@ public final class MuseumDungeon extends AbstractInstance
 	{
 		final L2Character creature = event.getAttacker();
 		final L2Npc npc = (L2Npc) event.getTarget();
-		final Skill skill = event.getSkill();
 		final Instance instance = npc.getInstanceWorld();
 		
 		if (isInInstance(instance) && !creature.isPlayer() && npc.isScriptValue(1))
 		{
 			getTimers().addTimer("THIEF_DIE", 500, npc, null);
 		}
-		else if (isInInstance(instance) && creature.isPlayer() && (skill == SPOIL.getSkill()) && npc.isScriptValue(0))
-		{
-			final L2Npc toyron = instance.getNpc(TOYRON);
-			addAttackDesire(toyron, npc);
-			npc.setScriptValue(1);
-		}
 	}
 	
 	@RegisterEvent(EventType.ON_CREATURE_DAMAGE_RECEIVED)
@@ -268,7 +277,8 @@ public final class MuseumDungeon extends AbstractInstance
 					}
 					
 					final L2Npc toyron = instance.getNpc(TOYRON);
-					addAttackDesire(toyron, target);
+					((L2QuestGuardInstance) toyron).addDamageHate(target, 0, 9999); // TODO: Find better way for attack
+					target.reduceCurrentHp(1, toyron, null);
 					((L2Npc) target).setScriptValue(1);
 					return new DamageReturn(false, true, false, target.getMaxHp() * DAMAGE_BY_SKILL);
 				}