ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #2684 from Adam-/npc-despawn

Browse Source 
fire npc despawn event before composition is nulled
This commit is contained in:
Adam
2018-05-15 11:20:25 -04:00
committed by GitHub
parent ce46256a44 e915070b4b
commit 06aa5cd680
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-mixins/src/main/java/net/runelite/api/mixins/FieldHook.java
View File

@@ -36,4 +36,6 @@ import java.lang.annotation.Target;
public @interface FieldHook
{
String value();
boolean before() default false;
}

14
runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
View File

@@ -71,7 +71,6 @@ import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.GrandExchangeOfferChanged;
import net.runelite.api.events.MapRegionChanged;
import net.runelite.api.events.MenuEntryAdded;
import net.runelite.api.events.NpcDespawned;
import net.runelite.api.events.NpcSpawned;
import net.runelite.api.events.PlayerDespawned;
import net.runelite.api.events.PlayerMenuOptionsChanged;
@@ -127,9 +126,6 @@ public abstract class RSClientMixin implements RSClient
@Inject
private static RSPlayer[] oldPlayers = new RSPlayer[2048];
@Inject
private static RSNPC[] oldNpcs = new RSNPC[32768];
@Inject
private static int itemPressedDurationBuffer;
@@ -805,17 +801,7 @@ public abstract class RSClientMixin implements RSClient
if (npc != null)
{
npc.setIndex(idx);
}
RSNPC oldNpc = oldNpcs[idx];
oldNpcs[idx] = npc;
if (oldNpc != null)
{
eventBus.post(new NpcDespawned(oldNpc));
}
if (npc != null)
{
deferredEventBus.post(new NpcSpawned(npc));
}
}

13
runelite-mixins/src/main/java/net/runelite/mixins/RSNPCMixin.java
View File

@@ -24,11 +24,14 @@
*/
package net.runelite.mixins;
import net.runelite.api.events.NpcDespawned;
import net.runelite.api.mixins.Copy;
import net.runelite.api.mixins.FieldHook;
import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.Mixin;
import net.runelite.api.mixins.Replace;
import net.runelite.api.mixins.Shadow;
import static net.runelite.client.callback.Hooks.eventBus;
import net.runelite.rs.api.RSClient;
import net.runelite.rs.api.RSModel;
import net.runelite.rs.api.RSNPC;
@@ -93,6 +96,16 @@ public abstract class RSNPCMixin implements RSNPC
npcIndex = id;
}
@FieldHook(value = "composition", before = true)
@Inject
public void onCompositionChanged(RSNPCComposition composition)
{
if (composition == null)
{
eventBus.post(new NpcDespawned(this));
}
}
@Copy("getModel")
public abstract RSModel rs$getModel();