DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevented NPEs if Asset linked to CustomImageObject is null

Browse Source
This commit is contained in:
CrushedPixel
2015-07-12 23:32:04 +02:00
parent b0429fcf44
commit b4e72af48f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/eu/crushedpixel/replaymod/assets/CustomImageObject.java
View File

@@ -88,7 +88,7 @@ public class CustomImageObject implements GuiEntryListEntry {
} }
} }
if(!ResourceHelper.isRegistered(resourceLocation)) { if(resourceLocation != null && !ResourceHelper.isRegistered(resourceLocation)) {
ResourceHelper.registerResource(resourceLocation); ResourceHelper.registerResource(resourceLocation);
Minecraft.getMinecraft().getTextureManager().loadTexture(resourceLocation, dynamicTexture); Minecraft.getMinecraft().getTextureManager().loadTexture(resourceLocation, dynamicTexture);
dynamicTexture.updateDynamicTexture(); dynamicTexture.updateDynamicTexture();

2
src/main/java/eu/crushedpixel/replaymod/assets/ReplayImageAsset.java
View File

@@ -49,7 +49,7 @@ public class ReplayImageAsset implements ReplayAsset<BufferedImage> {
ResourceHelper.freeResource(previewResource); ResourceHelper.freeResource(previewResource);
for(CustomImageObject object : ReplayHandler.getCustomImageObjects()) { 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); object.setImage(this.object);
} }
} }