Merge pull request #557 from Shukaro/master

Fixed NPE crash with Factorization Barrels
2013-01-10 03:01:13 -08:00 · 2013-01-10 03:01:13 -08:00 · 27e8d4c877
commit 27e8d4c877
parent d5420f8796 148ee72092
1 changed files with 3 additions and 0 deletions
--- a/common/buildcraft/core/utils/Localization.java
+++ b/common/buildcraft/core/utils/Localization.java
@ -51,6 +51,9 @@ public class Localization {
 	 * @return
 	 */
 	public static synchronized String get(String key) {
+        if (getCurrentLanguage() == null) {
+            return key;
+        }
 		if (!getCurrentLanguage().equals(loadedLanguage)) {
 			defaultMappings.clear();
 			mappings.clear();