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

Use Object.equals for Overlays

Browse Source 
- Generated equals from Lombok can cause falsy equals checks and so match
with unrelated overlay.
- Do not add overlay twice to overlay list based on equals

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
This commit is contained in:
Tomas Slusny
2018-06-14 14:31:20 +02:00
committed by Abex
parent b4150a47f4
commit 205659defa
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
runelite-client/src/main/java/net/runelite/client/ui/overlay/Overlay.java
View File

@@ -27,10 +27,12 @@ package net.runelite.client.ui.overlay;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.Point; import java.awt.Point;
import java.awt.Rectangle; import java.awt.Rectangle;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import net.runelite.client.ui.overlay.components.LayoutableRenderableEntity; import net.runelite.client.ui.overlay.components.LayoutableRenderableEntity;
@Data @Getter
@Setter
public abstract class Overlay implements LayoutableRenderableEntity public abstract class Overlay implements LayoutableRenderableEntity
{ {
private Point preferredLocation; private Point preferredLocation;

5
runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java
View File

@@ -109,6 +109,11 @@ public class OverlayManager
*/ */
public synchronized boolean add(final Overlay overlay) public synchronized boolean add(final Overlay overlay)
{ {
if (overlays.contains(overlay))
{
return false;
}
final boolean add = overlays.add(overlay); final boolean add = overlays.add(overlay);
if (add) if (add)