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

[PR #172] [MERGED] Changesftw #3140

New Issue
Closed
opened 2026-05-24 12:20:49 +00:00 by Dark98 · 0 comments
Dark98 commented 2026-05-24 12:20:49 +00:00
Owner
Copy Link
Copy Source

📋 Pull Request Information

Original PR: https://github.com/2006-Scape/2006Scape/pull/172
Author: @mrextremez
Created: 11/11/2019
Status: ✅ Merged
Merged: 11/11/2019
Merged by: @dginovker

Base: master ← Head: changesftw

📝 Commits (2)

📊 Changes

8 files changed (+134432 additions, -17 deletions)

View changed files

➕ 2006Redone Server/data/cfg/npcDefinitions.xml (+134240 -0)
📝 2006Redone Server/src/redone/game/content/combat/range/DwarfCannon.java (+1 -1)
📝 2006Redone Server/src/redone/game/content/skills/thieving/Stalls.java (+1 -1)
➕ 2006Redone Server/src/redone/game/npcs/NPCDefinition.java (+129 -0)
📝 2006Redone Server/src/redone/game/npcs/NpcHandler.java (+21 -12)
📝 2006Redone Server/src/redone/game/players/Player.java (+2 -2)
📝 2006Redone Server/src/redone/game/players/PlayerAssistant.java (+1 -1)
➕ 2006Redone Server/src/redone/util/XStreamUtil.java (+37 -0)

📄 Description

Npc defintions, aggresion, fixes some errors

🔄 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/172 **Author:** [@mrextremez](https://github.com/mrextremez) **Created:** 11/11/2019 **Status:** ✅ Merged **Merged:** 11/11/2019 **Merged by:** [@dginovker](https://github.com/dginovker) **Base:** `master` ← **Head:** `changesftw` --- ### 📝 Commits (2) - [`ba24fbe`](https://github.com/2006-Scape/2006Scape/commit/ba24fbeb3ddfa2e4fe952114d6bfab37cc6aa11d) Npc definitions/npc aggressiveness - [`2e8155e`](https://github.com/2006-Scape/2006Scape/commit/2e8155e700d96c73766ac0eeaa10fafd50455c58) Error fix ### 📊 Changes **8 files changed** (+134432 additions, -17 deletions) <details> <summary>View changed files</summary> ➕ `2006Redone Server/data/cfg/npcDefinitions.xml` (+134240 -0) 📝 `2006Redone Server/src/redone/game/content/combat/range/DwarfCannon.java` (+1 -1) 📝 `2006Redone Server/src/redone/game/content/skills/thieving/Stalls.java` (+1 -1) ➕ `2006Redone Server/src/redone/game/npcs/NPCDefinition.java` (+129 -0) 📝 `2006Redone Server/src/redone/game/npcs/NpcHandler.java` (+21 -12) 📝 `2006Redone Server/src/redone/game/players/Player.java` (+2 -2) 📝 `2006Redone Server/src/redone/game/players/PlayerAssistant.java` (+1 -1) ➕ `2006Redone Server/src/redone/util/XStreamUtil.java` (+37 -0) </details> ### 📄 Description Npc defintions, aggresion, fixes some errors --- <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-24 12:20:49 +00:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
Cannot Reproduce
Difficulty: Easy
Difficulty: Easy
Difficulty: Hard
Difficulty: Medium
Documentation
enhancement
Highest Priority of Type
New Content
New Content
pull-request
Mirrored from GitHub Pull Request
 QoL
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
Dark98
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: 2006-Scape/2006Scape#3140
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?