Merge remote-tracking branch 'runelite/master' into 2310-merge

This commit is contained in:
Owain van Brakel
2019-10-31 03:31:27 +01:00
16 changed files with 211 additions and 62 deletions
@@ -24,15 +24,11 @@
*/
package net.runelite.api.events;
import javax.annotation.Nullable;
import lombok.Data;
import net.runelite.api.Actor;
@Data
public class AreaSoundEffectPlayed implements Event
{
@Nullable
private final Actor source;
private int soundId;
private int sceneX;
private int sceneY;
@@ -24,15 +24,11 @@
*/
package net.runelite.api.events;
import javax.annotation.Nullable;
import lombok.Data;
import net.runelite.api.Actor;
@Data
public class SoundEffectPlayed implements Event
{
@Nullable
private final Actor source;
private int soundId;
private int delay;