From 512d4d7271ad7a0faa673b960cc8133ad1fef771 Mon Sep 17 00:00:00 2001 From: Brennan Ward Date: Tue, 22 Feb 2022 17:20:29 -0500 Subject: [PATCH] Apply nullable annotations to LootingLevelEvent (#8422) --- src/main/java/net/minecraftforge/common/ForgeHooks.java | 4 ++-- .../event/entity/living/LootingLevelEvent.java | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/minecraftforge/common/ForgeHooks.java b/src/main/java/net/minecraftforge/common/ForgeHooks.java index e0b7ce878b..b0859492bc 100644 --- a/src/main/java/net/minecraftforge/common/ForgeHooks.java +++ b/src/main/java/net/minecraftforge/common/ForgeHooks.java @@ -347,7 +347,7 @@ public class ForgeHooks return (MinecraftForge.EVENT_BUS.post(event) ? null : new float[]{event.getDistance(), event.getDamageMultiplier()}); } - public static int getLootingLevel(Entity target, @Nullable Entity killer, DamageSource cause) + public static int getLootingLevel(Entity target, @Nullable Entity killer, @Nullable DamageSource cause) { int looting = 0; if (killer instanceof LivingEntity) @@ -357,7 +357,7 @@ public class ForgeHooks return looting; } - public static int getLootingLevel(LivingEntity target, DamageSource cause, int level) + public static int getLootingLevel(LivingEntity target, @Nullable DamageSource cause, int level) { LootingLevelEvent event = new LootingLevelEvent(target, cause, level); MinecraftForge.EVENT_BUS.post(event); diff --git a/src/main/java/net/minecraftforge/event/entity/living/LootingLevelEvent.java b/src/main/java/net/minecraftforge/event/entity/living/LootingLevelEvent.java index 69f1bb32da..6dfd9c128b 100644 --- a/src/main/java/net/minecraftforge/event/entity/living/LootingLevelEvent.java +++ b/src/main/java/net/minecraftforge/event/entity/living/LootingLevelEvent.java @@ -20,20 +20,25 @@ package net.minecraftforge.event.entity.living; import net.minecraft.world.entity.LivingEntity; + +import javax.annotation.Nullable; + import net.minecraft.world.damagesource.DamageSource; public class LootingLevelEvent extends LivingEvent { + @Nullable private final DamageSource damageSource; private int lootingLevel; - public LootingLevelEvent(LivingEntity entity, DamageSource damageSource, int lootingLevel) { + public LootingLevelEvent(LivingEntity entity, @Nullable DamageSource damageSource, int lootingLevel) { super(entity); this.damageSource = damageSource; this.lootingLevel = lootingLevel; } + @Nullable public DamageSource getDamageSource() { return damageSource; }