lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

nullcheck obtained entity entries (#1206, 1207)

Browse source 
No idea what's going on here but aight
This commit is contained in:
Nicholas Ignoffo 2018-02-06 17:04:04 -08:00
parent 27e41e2e77
commit 8be8cc30b9
4 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java
View file

@ -52,6 +52,8 @@ public class ItemDaggerOfSacrifice extends Item implements IVariantProvider {
return false; return false;
EntityEntry entityEntry = EntityRegistry.getEntry(target.getClass()); EntityEntry entityEntry = EntityRegistry.getEntry(target.getClass());
if (entityEntry == null)
return false;
int lifeEssenceRatio = BloodMagicAPI.INSTANCE.getSacrificialValues().getOrDefault(entityEntry.getRegistryName(), 25); int lifeEssenceRatio = BloodMagicAPI.INSTANCE.getSacrificialValues().getOrDefault(entityEntry.getRegistryName(), 25);
if (lifeEssenceRatio <= 0) if (lifeEssenceRatio <= 0)

2
src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java
View file

@ -104,7 +104,7 @@ public class RitualForsakenSoul extends Ritual {
for (EntityLivingBase entity : entities) { for (EntityLivingBase entity : entities) {
EntityEntry entityEntry = EntityRegistry.getEntry(entity.getClass()); EntityEntry entityEntry = EntityRegistry.getEntry(entity.getClass());
if (BloodMagicAPI.INSTANCE.getBlacklist().getSacrifice().contains(entityEntry.getRegistryName())) if (entityEntry == null || BloodMagicAPI.INSTANCE.getBlacklist().getSacrifice().contains(entityEntry.getRegistryName()))
continue; continue;
if (entity.isEntityAlive() && !(entity instanceof EntityPlayer)) { if (entity.isEntityAlive() && !(entity instanceof EntityPlayer)) {

2
src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java
View file

@ -79,7 +79,7 @@ public class RitualWellOfSuffering extends Ritual {
for (EntityLivingBase entity : entities) { for (EntityLivingBase entity : entities) {
EntityEntry entityEntry = EntityRegistry.getEntry(entity.getClass()); EntityEntry entityEntry = EntityRegistry.getEntry(entity.getClass());
if (BloodMagicAPI.INSTANCE.getBlacklist().getSacrifice().contains(entityEntry.getRegistryName())) if (entityEntry == null || BloodMagicAPI.INSTANCE.getBlacklist().getSacrifice().contains(entityEntry.getRegistryName()))
continue; continue;
int lifeEssenceRatio = BloodMagicAPI.INSTANCE.getSacrificialValues().getOrDefault(entityEntry.getRegistryName(), SACRIFICE_AMOUNT); int lifeEssenceRatio = BloodMagicAPI.INSTANCE.getSacrificialValues().getOrDefault(entityEntry.getRegistryName(), SACRIFICE_AMOUNT);

2
src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java
View file

@ -318,7 +318,7 @@ public class GenericHandler {
@SubscribeEvent @SubscribeEvent
public static void onTeleposeEntity(TeleposeEvent.Ent event) { public static void onTeleposeEntity(TeleposeEvent.Ent event) {
EntityEntry entry = EntityRegistry.getEntry(event.entity.getClass()); EntityEntry entry = EntityRegistry.getEntry(event.entity.getClass());
if (BloodMagicAPI.INSTANCE.getBlacklist().getTeleposerEntities().contains(entry.getRegistryName())) if (entry != null && BloodMagicAPI.INSTANCE.getBlacklist().getTeleposerEntities().contains(entry.getRegistryName()))
event.setCanceled(true); event.setCanceled(true);
} }