[PR #472] [MERGED] Fix call to NpcAggressive.isAggressive #545

New Issue

2026-05-15T02:57:47Z

Dark98 commented

2026-05-15 02:57:47 +00:00

📋 Pull Request Information

Original PR: https://github.com/2006-Scape/2006Scape/pull/472
Author: @nickgal
Created: 1/29/2021
Status: ✅ Merged
Merged: 1/29/2021
Merged by: @dginovker

Base: master ← Head: aggression-fix

📝 Commits (1)

ae1bed0 Fix call to NpcAggressive.isAggressive

📊 Changes

1 file changed (+1 additions, -1 deletions)

View changed files

📝 2006Redone Server/src/main/java/com/rebotted/game/npcs/NpcHandler.java (+1 -1)

📄 Description

Potential aggression regression :)

#416 appears to have overzealously changed NpcAggressive.isAggressive(i) to NpcAggressive.isAggressive(npcs[i].npcType).
This should not by needed because i within NpcAggressive.isAggressive is always passed into NpcHandler.npcs[i]
https://github.com/2006rebotted/2006rebotted/blob/12951be95407d172b91d06ff57e8376c8d71fb58/2006Redone%20Server/src/main/java/com/rebotted/game/content/combat/npcs/NpcAggressive.java#L22-L24
https://github.com/2006rebotted/2006rebotted/blob/12951be95407d172b91d06ff57e8376c8d71fb58/2006Redone%20Server/src/main/java/com/rebotted/game/content/minigames/FightCaves.java#L396-L397

As a sidenote, I noticed the issue within the Lumbridge cow field where some of the cows were aggresive on a local server current with master.

I wasn't sure if this resolves the need for try {} catch in NpcAggressive.isAggressive but suspect it may.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/2006-Scape/2006Scape/pull/472 **Author:** [@nickgal](https://github.com/nickgal) **Created:** 1/29/2021 **Status:** ✅ Merged **Merged:** 1/29/2021 **Merged by:** [@dginovker](https://github.com/dginovker) **Base:** `master` ← **Head:** `aggression-fix` --- ### 📝 Commits (1) - [`ae1bed0`](https://github.com/2006-Scape/2006Scape/commit/ae1bed098d0e04fc690576eb1807bfef47ffa729) Fix call to NpcAggressive.isAggressive ### 📊 Changes **1 file changed** (+1 additions, -1 deletions) <details> <summary>View changed files</summary> 📝 `2006Redone Server/src/main/java/com/rebotted/game/npcs/NpcHandler.java` (+1 -1) </details> ### 📄 Description Potential aggression regression :) #416 appears to have overzealously changed `NpcAggressive.isAggressive(i)` to `NpcAggressive.isAggressive(npcs[i].npcType)`. This should not by needed because `i` within `NpcAggressive.isAggressive` is always passed into `NpcHandler.npcs[i]` https://github.com/2006rebotted/2006rebotted/blob/12951be95407d172b91d06ff57e8376c8d71fb58/2006Redone%20Server/src/main/java/com/rebotted/game/content/combat/npcs/NpcAggressive.java#L22-L24 https://github.com/2006rebotted/2006rebotted/blob/12951be95407d172b91d06ff57e8376c8d71fb58/2006Redone%20Server/src/main/java/com/rebotted/game/content/minigames/FightCaves.java#L396-L397 As a sidenote, I noticed the issue within the Lumbridge cow field where some of the cows were aggresive on a local server current with master. I wasn't sure if this resolves the need for `try {} catch` in `NpcAggressive.isAggressive` but suspect it may. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

Dark98 added the pull-request label 2026-05-15 02:57:47 +00:00

Dark98 closed this issue