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

Merge pull request 'Update Master' (#7) from dev into master

Browse source 
Reviewed-on: #7
This commit is contained in:
randy 2024-12-05 15:59:23 -07:00
commit ff80ec3b51
3 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Server/src/main/content/global/handlers/scenery/SearchOptionPlugin.java
View file

@ -8,6 +8,8 @@ import core.game.node.item.Item;
import core.plugin.Initializable;
import core.plugin.Plugin;
import static core.api.ContentAPIKt.*;
/**
* Handles the search option.
* @author 'Vexia
@ -80,6 +82,10 @@ public class SearchOptionPlugin extends OptionHandler {
player.getInventory().add(new Item(946));
return true;
}
if (node.getId() == 12799 && hasRequirement(player, "In Aid of the Myreque")) {
openBankAccount(player);
return true;
}
player.getPacketDispatch().sendMessage("You search the " + node.getName().toLowerCase() + " but find nothing.");
return true;
}

6
Server/src/main/content/global/skill/thieving/ThievingListeners.kt
View file

@ -95,7 +95,11 @@ class ThievingListeners : InteractionListener {
}
}
//pickpocket again.
InteractionListeners.run(node.id, IntType.NPC,"Pickpocket",player,node)
if (player.skills.lifepoints > pickpocketData.stunDamageMax) {
InteractionListeners.run(node.id, IntType.NPC,"Pickpocket",player,node)
} else {
player.sendMessage("It's probably not a good idea to continue with your injuries.")
}
return@on true
}

8
Server/src/main/content/region/misc/keldagrim/handlers/KeldagrimPlugin.kt
View file

@ -46,6 +46,12 @@ class KeldagrimOptionHandlers : OptionHandler() {
28094 -> player.dialogueInterpreter.open(GETrapdoorDialogueID)
}
}
"ride" -> {
when(node.id){
7029 -> player.dialogueInterpreter.open(GETrapdoorDialogueID)
7030 -> player.dialogueInterpreter.open(GETrapdoorDialogueID)
}
}
"enter" -> {
when(node.id){
5014 -> player.properties.teleportLocation = Location.create(2730, 3713, 0)
@ -62,6 +68,8 @@ class KeldagrimOptionHandlers : OptionHandler() {
SceneryDefinition.forId(9138).handlers["option:climb-up"] = this
SceneryDefinition.forId(28094).handlers["option:open"] = this
SceneryDefinition.forId(5014).handlers["option:enter"] = this
SceneryDefinition.forId(7029).handlers["option:ride"] = this
SceneryDefinition.forId(7030).handlers["option:ride"] = this
return this
}
}