Skip to content

Fix potential NPE from mod-added mobs on NeoForge servers #1402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CatTeaA wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix potential NPE from mod-added mobs on NeoForge servers #1402

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/main/java/com/bekvon/bukkit/residence/listeners/ResidenceListener1_21.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,9 @@ public void onAnimalFeeding(PlayerInteractEntityEvent event) {
}

private boolean isFeedingAnimal(CMIEntityType type, Material held) {
if (type == null) {
return false;
}
switch (type) {
case ARMADILLO: return isItemTag(held, "armadillo_food");
case AXOLOTL: return isItemTag(held, "axolotl_food");
Expand Down Expand Up @@ -341,6 +344,9 @@ private static boolean isEquipFitAnimal(Entity entity, CMIMaterial held) {
return false;

CMIEntityType type = CMIEntityType.get(entity);
if (type == null)
return false;

boolean isBodySlotAir = entInv.getItem(EquipmentSlot.BODY).getType() == Material.AIR;

if (held.containsCriteria(CMIMC.CARPET))
Expand Down