Minor cleanup

CitizensDev · Jan 28, 2022 · 20a3315 · 20a3315
1 parent b1c87df
commit 20a3315
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/main/java/net/citizensnpcs/api/npc/AbstractNPC.java b/src/main/java/net/citizensnpcs/api/npc/AbstractNPC.java
@@ -245,7 +245,7 @@ public <T extends Trait> T getOrAddTrait(Class<T> clazz) {
             trait = getTraitFor(clazz);
             addTrait(trait);
         }
-        return trait != null ? clazz.cast(trait) : null;
+        return clazz.cast(trait);
     }
 
     @Override
@@ -265,7 +265,7 @@ protected Trait getTraitFor(Class<? extends Trait> clazz) {
 
     @Override
     public <T extends Trait> T getTraitNullable(Class<T> clazz) {
-        return clazz.cast(traits.get(clazz)); // #cast allows null as value
+        return clazz.cast(traits.get(clazz));
     }
 
     @Override
@@ -280,8 +280,7 @@ public UUID getUniqueId() {
 
     @Override
     public int hashCode() {
-        final int prime = 31;
-        return prime + uuid.hashCode();
+        return 31 + uuid.hashCode();
     }
 
     @Override