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 #492] [MERGED] Easter Event + Ectotokens #8187

New Issue
Closed
opened 2026-05-31 12:22:09 +00:00 by Dark98 · 0 comments
Dark98 commented 2026-05-31 12:22:09 +00:00
Owner
Copy Link
Copy Source

📋 Pull Request Information

Original PR: https://github.com/2006-Scape/2006Scape/pull/492
Author: @JohnsonMichaels123
Created: 4/4/2021
Status: ✅ Merged
Merged: 4/6/2021
Merged by: @Dark98

Base: master ← Head: master

📝 Commits (10+)

📊 Changes

6 files changed (+189 additions, -3 deletions)

View changed files

📝 .gitignore (+1 -0)
📝 2006Scape Server/data/cfg/spawns.json (+60 -0)
📝 2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueHandler.java (+96 -2)
📝 2006Scape Server/src/main/java/com/rs2/game/npcs/NpcActions.java (+21 -0)
📝 2006Scape Server/src/main/java/com/rs2/game/players/Player.java (+1 -1)
📝 2006Scape Server/src/main/java/com/rs2/game/players/PlayerSave.java (+10 -0)

📄 Description

Easter Event Update

  • Easter Bunny appears south of Falador and gives you a short quest for Easter where you can receive a reward
  • Added Easter Event in player save data

Port Phasmatys

  • Added Ecto-tokens in player save data

gitignore

  • Git now ignores .DS_Store files

🔄 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/492 **Author:** [@JohnsonMichaels123](https://github.com/JohnsonMichaels123) **Created:** 4/4/2021 **Status:** ✅ Merged **Merged:** 4/6/2021 **Merged by:** [@Dark98](https://github.com/Dark98) **Base:** `master` ← **Head:** `master` --- ### 📝 Commits (10+) - [`3a47e6b`](https://github.com/2006-Scape/2006Scape/commit/3a47e6bf4ba213f179e675a6eb32e0cc01f941e7) New NPC Spawns for Port Phasmatys - [`65640ed`](https://github.com/2006-Scape/2006Scape/commit/65640ed8c9c2fe67eae947c91bcc4275521fd1b2) ObjectActions for Ectofuntus and Energy Barrier - [`a33c1d9`](https://github.com/2006-Scape/2006Scape/commit/a33c1d98a2a1e4b459986a43972beb3312a49de4) Added Ak-Haranu's Exotic Shop - [`4cac10e`](https://github.com/2006-Scape/2006Scape/commit/4cac10e6b820af6d1b9e6c9d833cd88c46e7268b) Fixed Ectofuntus Worship - [`707d36b`](https://github.com/2006-Scape/2006Scape/commit/707d36b7476836c12974db78939e56578e0cb4cc) Gravingas Exclamations - [`99a76ae`](https://github.com/2006-Scape/2006Scape/commit/99a76ae508d29f24932d7b5cb157a090beb28670) Easter Event Updates - [`445b79c`](https://github.com/2006-Scape/2006Scape/commit/445b79ca133e91628da7f92325df6c4829bb6db2) Merge branch 'master' of https://github.com/JohnsonMichaels123/2006Scape - [`edcc421`](https://github.com/2006-Scape/2006Scape/commit/edcc421907411f5bb862608b0005ba99960413f9) Delete .DS_Store - [`49c7d21`](https://github.com/2006-Scape/2006Scape/commit/49c7d21661b8c189c9fec26532a54afd7dd85d2c) Delete .DS_Store - [`bfbc0d7`](https://github.com/2006-Scape/2006Scape/commit/bfbc0d7d5e4d6177d13664682e8df6fa79d72465) Delete .DS_Store ### 📊 Changes **6 files changed** (+189 additions, -3 deletions) <details> <summary>View changed files</summary> 📝 `.gitignore` (+1 -0) 📝 `2006Scape Server/data/cfg/spawns.json` (+60 -0) 📝 `2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueHandler.java` (+96 -2) 📝 `2006Scape Server/src/main/java/com/rs2/game/npcs/NpcActions.java` (+21 -0) 📝 `2006Scape Server/src/main/java/com/rs2/game/players/Player.java` (+1 -1) 📝 `2006Scape Server/src/main/java/com/rs2/game/players/PlayerSave.java` (+10 -0) </details> ### 📄 Description Easter Event Update - Easter Bunny appears south of Falador and gives you a short quest for Easter where you can receive a reward - Added Easter Event in player save data Port Phasmatys - Added Ecto-tokens in player save data gitignore - Git now ignores .DS_Store files --- <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-31 12:22:09 +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#8187
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?