diff options
| author | Muramasa <haydenkilloh@gmail.com> | 2016-08-13 09:10:38 +0100 |
|---|---|---|
| committer | Muramasa <haydenkilloh@gmail.com> | 2016-08-13 09:10:38 +0100 |
| commit | 0345ada52c4e70bd167c1decc63209c4ef79f3bc (patch) | |
| tree | ebdcc1a78bc3288d8325b6eee48f41a7ddcbd39a /src/main/java/gregtech/api/enums | |
| parent | 9ca24419fbec417937d4014ab7c21434ebd79366 (diff) | |
| download | GT5-Unofficial-0345ada52c4e70bd167c1decc63209c4ef79f3bc.tar.gz GT5-Unofficial-0345ada52c4e70bd167c1decc63209c4ef79f3bc.tar.bz2 GT5-Unofficial-0345ada52c4e70bd167c1decc63209c4ef79f3bc.zip | |
Remove null checks
Diffstat (limited to 'src/main/java/gregtech/api/enums')
| -rw-r--r-- | src/main/java/gregtech/api/enums/Dyes.java | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/enums/Materials.java | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/enums/OrePrefixes.java | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/gregtech/api/enums/Dyes.java b/src/main/java/gregtech/api/enums/Dyes.java index 66c3927783..c59b310d55 100644 --- a/src/main/java/gregtech/api/enums/Dyes.java +++ b/src/main/java/gregtech/api/enums/Dyes.java @@ -64,7 +64,7 @@ public enum Dyes implements IColorModulationContainer { public static Dyes get(String aColor) { Object tObject = GT_Utility.getFieldContent(Dyes.class, aColor, false, false); - if (tObject != null && tObject instanceof Dyes) return (Dyes) tObject; + if (tObject instanceof Dyes) return (Dyes) tObject; return _NULL; } diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 2175e9246c..f3d4fb1f8e 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -1393,7 +1393,7 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { public static Materials get(String aMaterialName) { Object tObject = GT_Utility.getFieldContent(Materials.class, aMaterialName, false, false); - if (tObject != null && tObject instanceof Materials) return (Materials) tObject; + if (tObject instanceof Materials) return (Materials) tObject; return _NULL; } diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java index 01d3e2d60a..fb8bd272c6 100644 --- a/src/main/java/gregtech/api/enums/OrePrefixes.java +++ b/src/main/java/gregtech/api/enums/OrePrefixes.java @@ -638,7 +638,7 @@ public enum OrePrefixes { public static OrePrefixes getPrefix(String aPrefixName, OrePrefixes aReplacement) { Object tObject = GT_Utility.getFieldContent(OrePrefixes.class, aPrefixName, false, false); - if (tObject != null && tObject instanceof OrePrefixes) return (OrePrefixes) tObject; + if (tObject instanceof OrePrefixes) return (OrePrefixes) tObject; return aReplacement; } |