mirror of
https://github.com/2006-Scape/2006Scape.git
synced 2026-07-02 16:49:03 +00:00
[PR #311] [MERGED] Random stuff 3 #13923
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/311
Author: @Gptaqbc
Created: 12/21/2019
Status: ✅ Merged
Merged: 12/21/2019
Merged by: @dginovker
Base:
master← Head:random-stuff-3📝 Commits (10+)
7c3f564Make ::update automatically restart server as well01bd595Merge remote-tracking branch 'upstream/master' into random-stuff-3ab1070dAdd bank area checks back since previously you could open a bank, and as long as you didn't open another interface you could abuse it77dc471Fix noclip (NEEDS TESTING)8b0838bMerge remote-tracking branch 'upstream/more_packet_prevention' into random-stuff-3a0c2e33Merge remote-tracking branch 'upstream/master' into random-stuff-3633f05aRevert "Fix noclip (#302)"41a0ddbMerge remote-tracking branch 'upstream/revert-302-more_packet_prevention' into random-stuff-3191001dMerge remote-tracking branch 'upstream/master' into random-stuff-334a3378::clip command removed, fixed a typo, reordered some stuff, fixed a bug with others cannon📊 Changes
12 files changed (+97 additions, -75 deletions)
View changed files
📝
2006Redone Client/src/ClientSettings.java(+0 -3)📝
2006Redone Client/src/Flo.java(+5 -1)📝
2006Redone Client/src/Game.java(+0 -13)📝
2006Redone Server/src/com/rebotted/game/content/combat/magic/MagicRequirements.java(+2 -2)📝
2006Redone Server/src/com/rebotted/game/content/combat/range/DwarfCannon.java(+7 -10)📝
2006Redone Server/src/com/rebotted/game/dialogues/DialogueHandler.java(+3 -3)📝
2006Redone Server/src/com/rebotted/game/players/Player.java(+2 -0)📝
2006Redone Server/src/com/rebotted/game/players/PlayerAssistant.java(+3 -4)📝
2006Redone Server/src/com/rebotted/game/shops/ShopAssistant.java(+0 -5)📝
2006Redone Server/src/com/rebotted/net/packets/impl/Commands.java(+35 -8)📝
2006Redone Server/src/com/rebotted/net/packets/impl/Walking.java(+40 -26)📝
CompiledServer/production/2006rebotted/com/rebotted/game/items/ItemAssistant.class(+0 -0)📄 Description
Someone asked for more players in the top ranks and devs thought it would also be cool so instead of 5 we now have 10 per type. Also added more alias to existing commands and added some stuff to the ::commands itself.
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.