From 1328c8c9e7f2bb73767c5c3baaae24fb27e83065 Mon Sep 17 00:00:00 2001 From: LexManos Date: Mon, 11 Jun 2012 14:42:30 -0700 Subject: [PATCH] Fixed possible NPE when blocks havent fully initalized yet. --- forge/patches/minecraft/net/minecraft/src/Block.java.patch | 2 +- .../patches/minecraft_server/net/minecraft/src/Block.java.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/forge/patches/minecraft/net/minecraft/src/Block.java.patch b/forge/patches/minecraft/net/minecraft/src/Block.java.patch index ca51fef622..e069f12fd6 100644 --- a/forge/patches/minecraft/net/minecraft/src/Block.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Block.java.patch @@ -18,7 +18,7 @@ lightOpacity[par1] = this.isOpaqueCube() ? 255 : 0; canBlockGrass[par1] = !par2Material.getCanBlockGrass(); } -+ isDefaultTexture = getTextureFile().equalsIgnoreCase("/terrain.png"); ++ isDefaultTexture = (getTextureFile() != null && getTextureFile().equalsIgnoreCase("/terrain.png")); } /** diff --git a/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch index 07badad70a..4f3650dd67 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch @@ -16,7 +16,7 @@ lightOpacity[par1] = this.isOpaqueCube() ? 255 : 0; canBlockGrass[par1] = !par2Material.getCanBlockGrass(); } -+ isDefaultTexture = getTextureFile().equalsIgnoreCase("/terrain.png"); ++ isDefaultTexture = (getTextureFile() != null && getTextureFile().equalsIgnoreCase("/terrain.png")); } /**