project: merge upstream

This commit is contained in:
Owain van Brakel
2019-10-30 04:22:38 +01:00
parent 13fc1f6554
commit 2655654c9f
23 changed files with 206 additions and 141 deletions

View File

@@ -1798,7 +1798,8 @@ public abstract class RSClientMixin implements RSClient
int type = client.getVarpDefinition(var0).getType();
if (type == 3 || type == 4 || type == 10)
{
client.getCallbacks().post(VolumeChanged.class, VolumeChanged.INSTANCE);
VolumeChanged volumeChanged = new VolumeChanged(null);
client.getCallbacks().post(VolumeChanged.class, volumeChanged);
}
}
}

View File

@@ -120,7 +120,7 @@ public abstract class SoundEffectMixin implements RSClient
{
// Regular sound effect
SoundEffectPlayed event = new SoundEffectPlayed();
SoundEffectPlayed event = new SoundEffectPlayed(null);
event.setSoundId(client.getQueuedSoundEffectIDs()[soundIndex]);
event.setDelay(client.getQueuedSoundEffectDelays()[soundIndex]);
client.getCallbacks().post(SoundEffectPlayed.class, event);
@@ -133,7 +133,7 @@ public abstract class SoundEffectMixin implements RSClient
int y = (packedLocation >> 8) & 0xFF;
int range = (packedLocation) & 0xFF;
AreaSoundEffectPlayed event = new AreaSoundEffectPlayed();
AreaSoundEffectPlayed event = new AreaSoundEffectPlayed(null);
event.setSoundId(client.getQueuedSoundEffectIDs()[soundIndex]);
event.setSceneX(x);
event.setSceneY(y);