Merge remote-tracking branch 'upstream/master' into master

runelite-mixins/src/main/java/net/runelite/mixins/RSGameObjectMixin.java

@@ -47,14 +47,14 @@ public abstract class RSGameObjectMixin implements RSGameObject
 	@Override
 	public Point getSceneMinLocation()
 	{
-		return new Point(getRelativeX(), getRelativeY());
+		return new Point(getStartX(), getStartY());
 	}
 
 	@Inject
 	@Override
 	public Point getSceneMaxLocation()
 	{
-		return new Point(getOffsetX(), getOffsetY());
+		return new Point(getEndX(), getEndY());
 	}
 
 	@Inject
@@ -108,4 +108,18 @@ public abstract class RSGameObjectMixin implements RSGameObject
 		int rotation = (getFlags() >> 6) & 3;
 		return new Angle(rotation * 512 + orientation);
 	}
+
+	@Override
+	@Inject
+	public int sizeX()
+	{
+		return getEndX() - getStartX() + 1;
+	}
+
+	@Override
+	@Inject
+	public int sizeY()
+	{
+		return getEndY() - getStartY() + 1;
+	}
 }