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

Fixes run energy, aggressiveness, and highscores (#137)

Browse Source 
* Update ShopAssistant.java

Adds ability to sell tokkul items back to shop for tokkul

* Fixes npc aggressiveness closes #132

* Fixes highscores for admin + ingame. Closes #131

* Caps run energy at 100%. Closes #135
This commit is contained in:
Mr Extremez
2019-11-06 09:55:08 -06:00
committed by Daniel Ginovker
parent a176bfa9cb
commit ff75851cad
5 changed files with 84 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/src/redone/game/npcs/NpcHandler.java
+6 -11
View File
@@ -4,7 +4,6 @@ import java.io.BufferedReader;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import redone.Constants;
import redone.Server;
import redone.game.content.combat.npcs.NpcAggressive;
@@ -418,20 +417,16 @@ public class NpcHandler {
* Attacking player
**/
if (NpcAggressive.isAggressive(i) && !npcs[i].underAttack && !npcs[i].isDead && !switchesAttackers(i)) {
Client client = (Client) PlayerHandler.players[NpcData.getCloseRandomPlayer(i)];
if (client != null && getNpcListCombat(npcs[i].npcType) * 2 > client.combatLevel || npcs[i].npcType == 1265 || npcs[i].npcType == 1267 || npcs[i].npcType == 96 || npcs[i].npcType == 97 || npcs[i].npcType == 141) {
Client client = (Client) PlayerHandler.players[NpcData.getCloseRandomPlayer(i)];
if (client != null) {
boolean aggressive = NpcAggressive.isAggressive(i) || getNpcListCombat(npcs[i].npcType) * 2 > client.combatLevel;
if (aggressive && !npcs[i].underAttack && !npcs[i].isDead && !switchesAttackers(i)) {
npcs[i].killerId = NpcData.getCloseRandomPlayer(i);
}
} else if (NpcAggressive.isAggressive(i) && !npcs[i].underAttack && !npcs[i].isDead && switchesAttackers(i)) {
Client c = (Client) PlayerHandler.players[NpcData.getCloseRandomPlayer(i)];
if (c != null && getNpcListCombat(npcs[i].npcType) * 2 > c.combatLevel) {
} else if (aggressive && !npcs[i].underAttack && !npcs[i].isDead && switchesAttackers(i)) {
npcs[i].killerId = NpcData.getCloseRandomPlayer(i);
}
}
/*
* Attacking player
*/
if (System.currentTimeMillis() - npcs[i].lastDamageTaken > 5000) {
npcs[i].underAttackBy = 0;