mirror of
https://github.com/2006-Scape/2006Scape.git
synced 2026-07-02 16:49:03 +00:00
[PR #508] [MERGED] Telekinetic grab and stuff #11410
Reference in New Issue
Block a user
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?
📋 Pull Request Information
Original PR: https://github.com/2006-Scape/2006Scape/pull/508
Author: @RedSparr0w
Created: 10/3/2021
Status: ✅ Merged
Merged: 10/5/2021
Merged by: @Dark98
Base:
master← Head:mage-training-arena-3📝 Commits (10+)
9f8577etidy up568fcbbTidy up check for spaced68f603Telekinetic base4dd4d8dDon't allow player to pickup statue03e0db0Tidy up item pickupe1fc25afixup, statue spawn736890eUpdate telekinetic grab33090962nd option for guardian statue8f19d3dhandle telegrab on statueddd3507Allow picking up global drops with telekinetic grab📊 Changes
22 files changed (+719 additions, -193 deletions)
View changed files
📝
2006Scape Client/src/main/java/Game.java(+40 -6)📝
2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/MagicData.java(+3 -1)📝
2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/MagicRequirements.java(+11 -12)📝
2006Scape Server/src/main/java/com/rs2/game/content/minigames/magetrainingarena/Alchemy.java(+1 -1)📝
2006Scape Server/src/main/java/com/rs2/game/content/minigames/magetrainingarena/Enchanting.java(+1 -1)➕
2006Scape Server/src/main/java/com/rs2/game/content/minigames/magetrainingarena/Graveyard.java(+129 -0)📝
2006Scape Server/src/main/java/com/rs2/game/content/minigames/magetrainingarena/MageTrainingArena.java(+11 -3)➕
2006Scape Server/src/main/java/com/rs2/game/content/minigames/magetrainingarena/Telekinetic.java(+271 -0)📝
2006Scape Server/src/main/java/com/rs2/game/items/GroundItem.java(+6 -1)📝
2006Scape Server/src/main/java/com/rs2/game/objects/ObjectsActions.java(+11 -4)📝
2006Scape Server/src/main/java/com/rs2/game/players/Player.java(+14 -3)📝
2006Scape Server/src/main/java/com/rs2/game/players/PlayerAssistant.java(+25 -2)📝
2006Scape Server/src/main/java/com/rs2/game/players/PlayerHandler.java(+1 -0)📝
2006Scape Server/src/main/java/com/rs2/game/players/PlayerSave.java(+5 -0)📝
2006Scape Server/src/main/java/com/rs2/net/packets/impl/ClickingButtons.java(+21 -10)📝
2006Scape Server/src/main/java/com/rs2/net/packets/impl/Commands.java(+16 -3)📝
2006Scape Server/src/main/java/com/rs2/net/packets/impl/ItemClick2OnGroundItem.java(+5 -0)📝
2006Scape Server/src/main/java/com/rs2/net/packets/impl/MagicOnFloorItems.java(+59 -79)📝
2006Scape Server/src/main/java/com/rs2/net/packets/impl/PickupItem.java(+40 -36)📝
2006Scape Server/src/main/java/com/rs2/world/Boundary.java(+10 -7)...and 2 more files
📄 Description
Mage Training Arena:
Implemented the Telekinetic maze
Implemented the Graveyard area
Other:
Fixup Tele Grab, can now be used on global item spawns if they can be seen from where the player is standing.
Other minor tidy up.
Allow pasting text into the client (Only the chatbox).
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.