Add LivingDamageEvent (#4349)

This commit is contained in:
Bartek Bok authored and LexManos committed 2017-10-31 15:29:19 -07:00
1 parent ba71017001
commit dd69f0623c
6 files changed
+267 -35

No files matched your search

@@ -113,6 +113,7 @@ import net.minecraftforge.event.ServerChatEvent;
import net.minecraftforge.event.entity.EntityTravelToDimensionEvent;
import net.minecraftforge.event.entity.item.ItemTossEvent;
import net.minecraftforge.event.entity.living.LivingAttackEvent;
import net.minecraftforge.event.entity.living.LivingDamageEvent;
import net.minecraftforge.event.entity.living.LivingDeathEvent;
import net.minecraftforge.event.entity.living.LivingDropsEvent;
import net.minecraftforge.event.entity.living.LivingEvent.LivingJumpEvent;
@@ -564,6 +565,12 @@ public class ForgeHooks
return (MinecraftForge.EVENT_BUS.post(event) ? 0 : event.getAmount());
}
public static float onLivingDamage(EntityLivingBase entity, DamageSource src, float amount)
{
LivingDamageEvent event = new LivingDamageEvent(entity, src, amount);
return (MinecraftForge.EVENT_BUS.post(event) ? 0 : event.getAmount());
}
public static boolean onLivingDeath(EntityLivingBase entity, DamageSource src)
{
return MinecraftForge.EVENT_BUS.post(new LivingDeathEvent(entity, src));
@@ -0,0 +1,64 @@
/*
* Minecraft Forge
* Copyright (c) 2017.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation version 2.1
* of the License.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
package net.minecraftforge.event.entity.living;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.fml.common.eventhandler.Cancelable;
import net.minecraft.util.DamageSource;
import net.minecraft.entity.EntityLivingBase;
/**
* LivingDamageEvent is fired just before damage is applied to entity.<br>
* At this point armor, potion and absorption modifiers have already been applied to damage - this is FINAL value.<br>
* Also note that appropriate resources (like armor durability and absorption extra hearths) have already been consumed.<br>
* This event is fired whenever an Entity is damaged in
* {@link EntityLivingBase#damageEntity(DamageSource, float)} and
* {@link EntityPlayer#damageEntity(DamageSource, float)}.<br>
* <br>
* This event is fired via the {@link ForgeHooks#onLivingDamage(EntityLivingBase, DamageSource, float)}.<br>
* <br>
* {@link #source} contains the DamageSource that caused this Entity to be hurt. <br>
* {@link #amount} contains the final amount of damage that will be dealt to entity. <br>
* <br>
* This event is {@link Cancelable}.<br>
* If this event is canceled, the Entity is not hurt. Used resources WILL NOT be restored.<br>
* <br>
* This event does not have a result. {@link HasResult}<br>
* @see LivingHurtEvent
**/
@Cancelable
public class LivingDamageEvent extends LivingEvent
{
private final DamageSource source;
private float amount;
public LivingDamageEvent(EntityLivingBase entity, DamageSource source, float amount)
{
super(entity);
this.source = source;
this.amount = amount;
}
public DamageSource getSource() { return source; }
public float getAmount() { return amount; }
public void setAmount(float amount) { this.amount = amount; }
}
@@ -43,6 +43,7 @@ import net.minecraft.entity.EntityLivingBase;
* This event does not have a result. {@link HasResult}<br>
* <br>
* This event is fired on the {@link MinecraftForge#EVENT_BUS}.
* @see LivingDamageEvent
**/
@Cancelable
public class LivingHurtEvent extends LivingEvent