Snowscape/Server
1
0
Fork 0
forked from 2009Scape/Server
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Merge 2009scape updates #19

Open
randy wants to merge 204 commits from 2009Scape:master into upstream
pull from: 2009Scape:master
merge into: Snowscape:upstream
Conversation 0 Commits 204 Files changed 719 +4 -17
2 changed files with 4 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 2845571082 - Show all commits

16
Server/data/configs/door_configs.json
View file

@ -343,7 +343,7 @@
}, },
{ {
"id": "2054", "id": "2054",
"replaceId": "24375", "replaceId": "2055",
"fence": "false", "fence": "false",
"metal": "false" "metal": "false"
}, },
@ -419,18 +419,6 @@
"fence": "false", "fence": "false",
"metal": "false" "metal": "false"
}, },
{
"id": "2391",
"replaceId": "1561",
"fence": "false",
"metal": "true"
},
{
"id": "2392",
"replaceId": "1561",
"fence": "false",
"metal": "true"
},
{ {
"id": "2397", "id": "2397",
"replaceId": "24383", "replaceId": "24383",
@ -2169,7 +2157,7 @@
}, },
{ {
"id": "24376", "id": "24376",
"replaceId": "24377", "replaceId": "24375",
"fence": "false", "fence": "false",
"metal": "false" "metal": "false"
}, },

5
Server/src/main/content/region/kandarin/ardougne/quest/plaguecity/PlagueCityListeners.kt
View file

@ -356,9 +356,8 @@ class PlagueCityListeners : InteractionListener {
on(Scenery.DOOR_2054, IntType.SCENERY, "open"){ player, node -> on(Scenery.DOOR_2054, IntType.SCENERY, "open"){ player, node ->
if (isQuestComplete(player, Quests.PLAGUE_CITY)){ if (isQuestComplete(player, Quests.PLAGUE_CITY)){
DoorActionHandler.handleDoor(player, node as SceneryNode) DoorActionHandler.handleAutowalkDoor(player, node as SceneryNode)
} } else {
else{
sendMessage(player, "This door is locked") sendMessage(player, "This door is locked")
} }
return@on true return@on true