Merge 2009scape updates #19

Open
randy wants to merge 204 commits from 2009Scape:master into upstream
2 changed files with 4 additions and 17 deletions
Showing only changes of commit 2845571082 - Show all commits

View file

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

View file

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