upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-12 01:27:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some console spam caused by a NullPointerException when checking scriptVisibleToPlayer(player) in ModelMPM

Browse Source
This commit is contained in:
luisc committed 2021-11-23 15:08:35 -06:00
1 parent d24422c3a1
commit ecbfd7dab0
2 files changed
+5 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/noppes/npcs/client/model/ModelMPM.java
+4 -4
View File
@@ -8,6 +8,7 @@ import net.minecraft.client.model.ModelBiped;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.MathHelper;
import noppes.npcs.CustomItems;
import noppes.npcs.ModelPartConfig;
@@ -295,7 +296,8 @@ public class ModelMPM extends ModelNPCMale{
@Override
public void render(Entity par1Entity, float par2, float par3, float par4, float par5, float par6, float par7){
EntityCustomNpc npc = (EntityCustomNpc) par1Entity;
if(npc.scriptInvisibleToPlayer(Minecraft.getMinecraft().thePlayer) && Minecraft.getMinecraft().thePlayer.getHeldItem().getItem() != CustomItems.wand)
EntityPlayer player = Minecraft.getMinecraft().thePlayer;
if(npc.scriptInvisibleToPlayer(Minecraft.getMinecraft().thePlayer) && (player.getHeldItem() == null || player.getHeldItem().getItem() != CustomItems.wand))
return;
if(entityModel != null){
@@ -314,9 +316,7 @@ public class ModelMPM extends ModelNPCMale{
}
}
else{
alpha = npc.isInvisible() && !npc.isInvisibleToPlayer(Minecraft.getMinecraft().thePlayer) ? 0.15f : 1;
if(npc.scriptInvisibleToPlayer(Minecraft.getMinecraft().thePlayer) && Minecraft.getMinecraft().thePlayer.getHeldItem().getItem() == CustomItems.wand)
alpha = 0.15f;
alpha = npc.isInvisible() && !npc.isInvisibleToPlayer(player) ? 0.15f : 1;
setPlayerData(npc);
currentlyPlayerTexture = true;
src/main/java/noppes/npcs/entity/EntityNPCInterface.java
+1 -4
View File
@@ -1597,10 +1597,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
@Override
public boolean isInvisibleToPlayer(EntityPlayer player){
if(display.invisibleToList != null && display.invisibleToList.contains(player.getPersistentID()))
return true;
return display.visible == 1 && (player.getHeldItem() == null || player.getHeldItem().getItem() != CustomItems.wand);
return (scriptInvisibleToPlayer(player) || display.visible == 1) && (player.getHeldItem() == null || player.getHeldItem().getItem() != CustomItems.wand);
}
public boolean scriptInvisibleToPlayer(EntityPlayer player){