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

Merge pull request #4558 from deathbeam/fix-null-and-emtpy-names

Browse Source 
Fix NPE when trying to draw null names
This commit is contained in:
Tomas Slusny
2018-07-30 10:32:01 +02:00
committed by GitHub
parent c777b63357 5adb2d2e37
commit 37be586202
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
runelite-api/src/main/java/net/runelite/api/Perspective.java
View File

@@ -373,10 +373,14 @@ public class Perspective
@Nonnull Client client, @Nonnull Client client,
@Nonnull Graphics2D graphics, @Nonnull Graphics2D graphics,
@Nonnull LocalPoint localLocation, @Nonnull LocalPoint localLocation,
@Nonnull String text, @Nullable String text,
int zOffset int zOffset)
)
{ {
if (text == null || "".equals(text))
{
return null;
}
int plane = client.getPlane(); int plane = client.getPlane();
Point p = worldToCanvas(client, localLocation.getX(), localLocation.getY(), plane, zOffset); Point p = worldToCanvas(client, localLocation.getX(), localLocation.getY(), plane, zOffset);

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

@@ -24,6 +24,7 @@
*/ */
package net.runelite.client.ui.overlay; package net.runelite.client.ui.overlay;
import com.google.common.base.Strings;
import java.awt.BasicStroke; import java.awt.BasicStroke;
import java.awt.Color; import java.awt.Color;
import java.awt.Dimension; import java.awt.Dimension;
@@ -67,6 +68,11 @@ public class OverlayUtil
public static void renderTextLocation(Graphics2D graphics, Point txtLoc, String text, Color color) public static void renderTextLocation(Graphics2D graphics, Point txtLoc, String text, Color color)
{ {
if (Strings.isNullOrEmpty(text))
{
return;
}
int x = txtLoc.getX(); int x = txtLoc.getX();
int y = txtLoc.getY(); int y = txtLoc.getY();