diff options
| author | Muramasa <haydenkilloh@gmail.com> | 2016-08-13 09:10:38 +0100 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2016-09-22 19:17:44 +0200 |
| commit | 04fec51acb0f1053dfea595c04ea0862da1d4f37 (patch) | |
| tree | e877274b8a2d7d4ca53e0d418268b97a41de050c /src/main/java/gregtech/api/enums | |
| parent | 789199a57823442dde1f91a1764cbc7e7dedade8 (diff) | |
| download | GT5-Unofficial-04fec51acb0f1053dfea595c04ea0862da1d4f37.tar.gz GT5-Unofficial-04fec51acb0f1053dfea595c04ea0862da1d4f37.tar.bz2 GT5-Unofficial-04fec51acb0f1053dfea595c04ea0862da1d4f37.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 a3ef13b9fd..f0883196ae 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -1423,7 +1423,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 c096a51f4a..da2f76b324 100644 --- a/src/main/java/gregtech/api/enums/OrePrefixes.java +++ b/src/main/java/gregtech/api/enums/OrePrefixes.java @@ -639,7 +639,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; } |