Original PR: https://github.com/2006-Scape/2006Scape/pull/304 Author: @Gptaqbc Created: 12/20/2019 Status: ✅ Merged Merged: 12/20/2019 Merged by: @dginovker
Base: master ← Head: random-stuff-3
master
random-stuff-3
7c3f564
01bd595
ab1070d
77dc471
8b0838b
a0c2e33
633f05a
41a0ddb
191001d
34a3378
8 files changed (+14 additions, -28 deletions)
📝 2006Redone Client/src/Game.java (+0 -12) 📝 2006Redone Server/src/com/rebotted/game/content/combat/magic/MagicRequirements.java (+2 -2) 📝 2006Redone Server/src/com/rebotted/game/content/combat/range/DwarfCannon.java (+6 -4) 📝 2006Redone Server/src/com/rebotted/game/dialogues/DialogueHandler.java (+1 -1) 📝 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) 📝 CompiledServer/production/2006rebotted/com/rebotted/game/items/ItemAssistant.class (+0 -0)
2006Redone Client/src/Game.java
2006Redone Server/src/com/rebotted/game/content/combat/magic/MagicRequirements.java
2006Redone Server/src/com/rebotted/game/content/combat/range/DwarfCannon.java
2006Redone Server/src/com/rebotted/game/dialogues/DialogueHandler.java
2006Redone Server/src/com/rebotted/game/players/Player.java
2006Redone Server/src/com/rebotted/game/players/PlayerAssistant.java
2006Redone Server/src/com/rebotted/game/shops/ShopAssistant.java
CompiledServer/production/2006rebotted/com/rebotted/game/items/ItemAssistant.class
closes #297
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.
No dependencies set.
The note is not visible to the blocked user.
📋 Pull Request Information
Original PR: https://github.com/2006-Scape/2006Scape/pull/304
Author: @Gptaqbc
Created: 12/20/2019
Status: ✅ Merged
Merged: 12/20/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
8 files changed (+14 additions, -28 deletions)
View changed files
📝
2006Redone Client/src/Game.java(+0 -12)📝
2006Redone Server/src/com/rebotted/game/content/combat/magic/MagicRequirements.java(+2 -2)📝
2006Redone Server/src/com/rebotted/game/content/combat/range/DwarfCannon.java(+6 -4)📝
2006Redone Server/src/com/rebotted/game/dialogues/DialogueHandler.java(+1 -1)📝
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)📝
CompiledServer/production/2006rebotted/com/rebotted/game/items/ItemAssistant.class(+0 -0)📄 Description
closes #297
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.