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

Fixed exception occurring when an NPC has no jobs that can be assigned to the player

Browse source 
Fixed an issue that caused killing jobs not to work without relogging first
This commit is contained in:
Ceikry 2022-07-02 07:54:27 +00:00 • committed by Ryan
parent 6dd30896f0
commit 931409ba97
2 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Server/src/main/java/core/game/node/entity/Entity.java
View file

@ -178,13 +178,7 @@ public abstract class Entity extends Node {
*/
public void unhook(EventHook hook)
{
GameWorld.getPulser().submit(new Pulse() {
@Override
public boolean pulse() {
for(ArrayList<EventHook> s : hooks.values()) s.remove(hook);
return true;
}
});
for(ArrayList<EventHook> s : hooks.values()) s.remove(hook);
}
/**

18
Server/src/main/kotlin/rs09/game/content/jobs/WorkForInteractionListener.kt
View file

@ -5,6 +5,7 @@ import SlayingJob
import api.*
import api.events.EventHook
import api.events.NPCKillEvent
import core.game.content.dialogue.FacialExpression
import core.game.node.entity.Entity
import core.game.node.entity.npc.NPC
import core.game.node.entity.player.Player
@ -85,9 +86,20 @@ class WorkForInteractionListener : InteractionListener, LoginListener {
val type = typeMap[node.id] ?: return@on false
jobId = if(type == 0) {
var job = gatheringMap[node.id]?.filter { checkRequirement(player, it) }?.random()
amount = job?.getAmount() ?: 0
job?.ordinal ?: 0
val job = gatheringMap[node.id]?.filter { checkRequirement(player, it) }?.randomOrNull()
if (job == null) {
sendNPCDialogue(
player,
node.id,
"I'm sorry, I don't currently have any jobs that you're qualified for.",
FacialExpression.HALF_THINKING
)
return@on true
}
amount = job.getAmount()
job.ordinal
} else {
SlayingJob.values().random().ordinal.also { amount = SlayingJob.values()[it].getAmount() }
}