2006-Scape/2006Scape
1
0
Fork 0
mirror of https://github.com/2006-Scape/2006Scape.git synced 2026-07-07 00:32:06 +00:00
Code Issues 4.5k Packages Projects Releases 10 Wiki Activity

Couple quick fixes (#240)

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

closes #236
closes #233
This commit is contained in:
Mr Extremez
2019-12-06 15:12:48 -06:00
committed by Daniel Ginovker
parent 9c21669609
commit 8e524cdcda
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/data/cfg/globaldrops.txt
+3 -3
View File
@@ -308,9 +308,9 @@
243:1:2912:9804 243:1:2912:9804
243:1:2910:9800 243:1:2910:9800
243:1:2905:9808 243:1:2905:9808
3138:1:3461:9485 3138:1:3461:9485:2
3138:1:3460:9482 3138:1:3460:9482:2
3138:1:3460:9480 3138:1:3460:9480:2
1059:1:3093:3487 1059:1:3093:3487
954:1:2907:3146 954:1:2907:3146
1963:1:2903:3146 1963:1:2903:3146
2006Redone Server/src/com/rebotted/game/content/skills/thieving/Pickpocket.java
+14 -3
View File
@@ -4,11 +4,11 @@ import com.rebotted.GameEngine;
import com.rebotted.event.CycleEvent; import com.rebotted.event.CycleEvent;
import com.rebotted.event.CycleEventContainer; import com.rebotted.event.CycleEventContainer;
import com.rebotted.event.CycleEventHandler; 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.randomevents.RandomEventHandler;
import com.rebotted.game.content.skills.SkillHandler; import com.rebotted.game.content.skills.SkillHandler;
import com.rebotted.game.items.ItemList; import com.rebotted.game.items.ItemList;
import com.rebotted.game.npcs.NpcHandler; import com.rebotted.game.npcs.NpcHandler;
import com.rebotted.game.players.Client;
import com.rebotted.game.players.Player; import com.rebotted.game.players.Player;
import com.rebotted.util.Misc; import com.rebotted.util.Misc;
@@ -251,8 +251,19 @@ public class Pickpocket extends SkillHandler {
c.getPlayerAssistant().refreshSkill(3); c.getPlayerAssistant().refreshSkill(3);
c.gfx100(80); c.gfx100(80);
c.startAnimation(404); c.startAnimation(404);
NpcHandler.npcs[npcId].forceChat("What do you think you're doing?"); c.getPacketSender().sendSound(SoundList.STUNNED, 100, 0);
NpcHandler.npcs[npcId].facePlayer(c.playerId); 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.lastThieve = System.currentTimeMillis() + 5000;
c.getPacketSender().sendMessage("You fail to pick the " + NpcHandler.getNpcListName(n.getNpc(npcId)).toLowerCase() + "'s pocket."); c.getPacketSender().sendMessage("You fail to pick the " + NpcHandler.getNpcListName(n.getNpc(npcId)).toLowerCase() + "'s pocket.");
container.stop(); container.stop();