From b4e72af48f0067221d306531889d382feef40cfa Mon Sep 17 00:00:00 2001
From: CrushedPixel <crushedpixelmaps@gmail.com>
Date: Sun, 12 Jul 2015 23:32:04 +0200
Subject: [PATCH] Prevented NPEs if Asset linked to CustomImageObject is null

---
 .../eu/crushedpixel/replaymod/assets/CustomImageObject.java     | 2 +-
 .../java/eu/crushedpixel/replaymod/assets/ReplayImageAsset.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/eu/crushedpixel/replaymod/assets/CustomImageObject.java b/src/main/java/eu/crushedpixel/replaymod/assets/CustomImageObject.java
index d41dea3d..5e4c7de6 100644
--- a/src/main/java/eu/crushedpixel/replaymod/assets/CustomImageObject.java
+++ b/src/main/java/eu/crushedpixel/replaymod/assets/CustomImageObject.java
@@ -88,7 +88,7 @@ public class CustomImageObject implements GuiEntryListEntry {
             }
         }
 
-        if(!ResourceHelper.isRegistered(resourceLocation)) {
+        if(resourceLocation != null && !ResourceHelper.isRegistered(resourceLocation)) {
             ResourceHelper.registerResource(resourceLocation);
             Minecraft.getMinecraft().getTextureManager().loadTexture(resourceLocation, dynamicTexture);
             dynamicTexture.updateDynamicTexture();
diff --git a/src/main/java/eu/crushedpixel/replaymod/assets/ReplayImageAsset.java b/src/main/java/eu/crushedpixel/replaymod/assets/ReplayImageAsset.java
index df3e3f78..9e355b38 100644
--- a/src/main/java/eu/crushedpixel/replaymod/assets/ReplayImageAsset.java
+++ b/src/main/java/eu/crushedpixel/replaymod/assets/ReplayImageAsset.java
@@ -49,7 +49,7 @@ public class ReplayImageAsset implements ReplayAsset<BufferedImage> {
         ResourceHelper.freeResource(previewResource);
 
         for(CustomImageObject object : ReplayHandler.getCustomImageObjects()) {
-            if(object.getLinkedAsset().equals(ReplayHandler.getAssetRepository().getUUIDForAsset(this))) {
+            if(object.getLinkedAsset() != null && object.getLinkedAsset().equals(ReplayHandler.getAssetRepository().getUUIDForAsset(this))) {
                 object.setImage(this.object);
             }
         }