From 8e524cdcdaf834b1d02845086afc0d0513ba9f2f Mon Sep 17 00:00:00 2001
From: Mr Extremez <aeggers90@hotmail.com>
Date: Fri, 6 Dec 2019 15:12:48 -0600
Subject: [PATCH] Couple quick fixes (#240)

- Fix global drops at KQ
- Should fix pickpocketing crash hopefully

closes #236
closes #233
---
 2006Redone Server/data/cfg/globaldrops.txt      |  6 +++---
 .../content/skills/thieving/Pickpocket.java     | 17 ++++++++++++++---
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/2006Redone Server/data/cfg/globaldrops.txt b/2006Redone Server/data/cfg/globaldrops.txt
index 6b7fbb30..c0f50c54 100644
--- a/2006Redone Server/data/cfg/globaldrops.txt	
+++ b/2006Redone Server/data/cfg/globaldrops.txt	
@@ -308,9 +308,9 @@
 243:1:2912:9804
 243:1:2910:9800
 243:1:2905:9808
-3138:1:3461:9485
-3138:1:3460:9482
-3138:1:3460:9480
+3138:1:3461:9485:2
+3138:1:3460:9482:2
+3138:1:3460:9480:2
 1059:1:3093:3487
 954:1:2907:3146
 1963:1:2903:3146
diff --git a/2006Redone Server/src/com/rebotted/game/content/skills/thieving/Pickpocket.java b/2006Redone Server/src/com/rebotted/game/content/skills/thieving/Pickpocket.java
index 2843f9f5..c1c5c50d 100644
--- a/2006Redone Server/src/com/rebotted/game/content/skills/thieving/Pickpocket.java	
+++ b/2006Redone Server/src/com/rebotted/game/content/skills/thieving/Pickpocket.java	
@@ -4,11 +4,11 @@ import com.rebotted.GameEngine;
 import com.rebotted.event.CycleEvent;
 import com.rebotted.event.CycleEventContainer;
 import com.rebotted.event.CycleEventHandler;
+import com.rebotted.game.content.music.sound.SoundList;
 import com.rebotted.game.content.randomevents.RandomEventHandler;
 import com.rebotted.game.content.skills.SkillHandler;
 import com.rebotted.game.items.ItemList;
 import com.rebotted.game.npcs.NpcHandler;
-import com.rebotted.game.players.Client;
 import com.rebotted.game.players.Player;
 import com.rebotted.util.Misc;
 
@@ -251,8 +251,19 @@ public class Pickpocket extends SkillHandler {
 							c.getPlayerAssistant().refreshSkill(3);
 							c.gfx100(80);
 							c.startAnimation(404);
-							NpcHandler.npcs[npcId].forceChat("What do you think you're doing?");
-							NpcHandler.npcs[npcId].facePlayer(c.playerId);
+							c.getPacketSender().sendSound(SoundList.STUNNED, 100, 0);
+							for (int i = 0; i < NpcHandler.MAX_NPCS; i++) {
+								if (NpcHandler.npcs[i] != null) {
+									if (NpcHandler.npcs[i].npcType == npcId) {
+										if (c.goodDistance(c.absX, c.absY, NpcHandler.npcs[i].absX, NpcHandler.npcs[i].absY, 1) && c.heightLevel == NpcHandler.npcs[i].heightLevel) {
+												if (!NpcHandler.npcs[i].underAttack) {
+													NpcHandler.npcs[i].forceChat("What do you think you're doing?");
+													NpcHandler.npcs[i].facePlayer(c.playerId);
+												}
+											}
+										}
+								}
+							}
 							c.lastThieve = System.currentTimeMillis() + 5000;
 							c.getPacketSender().sendMessage("You fail to pick the " + NpcHandler.getNpcListName(n.getNpc(npcId)).toLowerCase() + "'s pocket.");
 							container.stop();