mirror of
https://github.com/2006-Scape/2006Scape.git
synced 2026-07-02 16:49:03 +00:00
[PR #649] [CLOSED] Added NPC size > 1 pathing #13349
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/649
Author: @ipkpjersi
Created: 12/31/2023
Status: ❌ Closed
Base:
master← Head:npc-size-pathing📝 Commits (10+)
4af67b7Added more client settings for winter and hide roofs1a0b757Removed unnecessary local var and added Javadoc comment0d87125Fixed dark wizards casting magic in melee range0baf36bAdded AttackType enum1d011a7Removed extra asterisk8400301Removed attackType magic numbersbef350bEnabled snow toggles by default79cb74cCombined snow month into one variable94658f0Added option for fixes without custom settings2cb4f25Added more main args📊 Changes
22 files changed (+134586 additions, -134380 deletions)
View changed files
📝
2006Scape Client/src/main/java/ClientSettings.java(+30 -0)📝
2006Scape Client/src/main/java/Flo.java(+1 -1)📝
2006Scape Client/src/main/java/Game.java(+26 -8)📝
2006Scape Client/src/main/java/Main.java(+23 -1)📝
2006Scape Client/src/main/java/ObjectManager.java(+6 -2)➕
2006Scape Server/data/cfg/npcDefinitions.json(+134246 -0)➖
2006Scape Server/data/cfg/npcDefinitions.xml(+0 -134240)➕
2006Scape Server/plugins/plugin/buttons/gameframe/SoundVolumeButtons.java(+37 -0)📝
2006Scape Server/src/main/java/com/rs2/GameEngine.java(+9 -9)➕
2006Scape Server/src/main/java/com/rs2/game/content/combat/AttackType.java(+18 -0)📝
2006Scape Server/src/main/java/com/rs2/game/content/combat/CombatAssistant.java(+14 -6)📝
2006Scape Server/src/main/java/com/rs2/game/content/combat/npcs/NpcCombat.java(+61 -57)📝
2006Scape Server/src/main/java/com/rs2/game/content/combat/npcs/NpcEmotes.java(+6 -5)📝
2006Scape Server/src/main/java/com/rs2/game/npcs/NPCDefinition.java(+19 -9)📝
2006Scape Server/src/main/java/com/rs2/game/npcs/NpcData.java(+49 -26)📝
2006Scape Server/src/main/java/com/rs2/game/npcs/NpcHandler.java(+23 -8)📝
2006Scape Server/src/main/java/com/rs2/game/players/Player.java(+1 -1)📝
2006Scape Server/src/main/java/com/rs2/game/players/PlayerAssistant.java(+3 -5)📝
2006Scape Server/src/main/java/com/rs2/game/players/PlayerSave.java(+5 -0)📝
2006Scape Server/src/main/java/com/rs2/net/PacketSender.java(+3 -0)...and 2 more files
📄 Description
This is probably fine to merge. It doesn't fix all pathing bugs that currently exist (it doesn't fix player clipping when moving/attacking/clicking on objects etc), that would likely be a ton of work, but this does address not handling NPC size > 1 pathing, and it doesn't seem to introduce any new bugs.
With that said, I'll go ahead and mark this as draft for now so we can make sure it gets tested more first since I don't really consider it fully ready or completely fully tested.
Also as a heads up, this is based off of my initial
developmentbranch PR, so that should probably get merged first before this one.🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.