MrSphay/WorldHandler
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix potential NPEs

Browse Source
This commit is contained in:
Marcel Konrad
2020-10-23 14:49:51 +02:00
parent a3ef5cb796
commit 0879628fcf
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/exopandora/worldhandler/builder/impl/BuilderSummon.java
View File

@@ -404,13 +404,15 @@ public class BuilderSummon extends CommandBuilderNBT
private void updateCustomComponent(String name) private void updateCustomComponent(String name)
{ {
if(name != null && this.getEntity() != null) ResourceLocation entity = this.getEntity();
if(name != null && entity != null)
{ {
if(EntityType.CAT.getRegistryName().equals(this.getEntity())) if(entity.equals(EntityType.CAT.getRegistryName()))
{ {
this.nbt.setCustomComponent("CatType", IntNBT.valueOf(new Random().nextInt(11))); this.nbt.setCustomComponent("CatType", IntNBT.valueOf(new Random().nextInt(11)));
} }
else if(EntityType.VILLAGER.getRegistryName().equals(this.getEntity())) else if(entity.equals(EntityType.VILLAGER.getRegistryName()))
{ {
for(VillagerProfession profession : ForgeRegistries.PROFESSIONS) for(VillagerProfession profession : ForgeRegistries.PROFESSIONS)
{ {
@@ -424,14 +426,14 @@ public class BuilderSummon extends CommandBuilderNBT
} }
} }
} }
else if(EntityType.ZOMBIE.getRegistryName().equals(this.getEntity())) else if(entity.equals(EntityType.ZOMBIE.getRegistryName()))
{ {
if(StringUtils.containsIgnoreCase(name, "Baby")) if(StringUtils.containsIgnoreCase(name, "Baby"))
{ {
this.nbt.setCustomComponent("IsBaby", ByteNBT.valueOf((byte) 1)); this.nbt.setCustomComponent("IsBaby", ByteNBT.valueOf((byte) 1));
} }
} }
else if(EntityType.CHICKEN.getRegistryName().equals(this.getEntity())) else if(entity.equals(EntityType.CHICKEN.getRegistryName()))
{ {
if(StringUtils.containsIgnoreCase(name, "Jockey") && !this.nbt.hasPassengers()) if(StringUtils.containsIgnoreCase(name, "Jockey") && !this.nbt.hasPassengers())
{ {
@@ -443,7 +445,7 @@ public class BuilderSummon extends CommandBuilderNBT
this.nbt.setCustomComponent("Passengers", list); this.nbt.setCustomComponent("Passengers", list);
} }
} }
else if(EntityType.SPIDER.getRegistryName().equals(this.getEntity())) else if(entity.equals(EntityType.SPIDER.getRegistryName()))
{ {
if(StringUtils.containsIgnoreCase(name, "Jockey") && !this.nbt.hasPassengers()) if(StringUtils.containsIgnoreCase(name, "Jockey") && !this.nbt.hasPassengers())
{ {