mirror of
https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git
synced 2026-01-25 10:32:49 +00:00
people turn off PVP?
This commit is contained in:
parent
7695c189ea
commit
fbe97e8d79
@ -10,6 +10,7 @@ import net.minecraft.entity.EntityLivingBase;
|
|||||||
import net.minecraft.entity.SharedMonsterAttributes;
|
import net.minecraft.entity.SharedMonsterAttributes;
|
||||||
import net.minecraft.entity.passive.EntityTameable;
|
import net.minecraft.entity.passive.EntityTameable;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
|
import net.minecraft.entity.player.EntityPlayerMP;
|
||||||
import net.minecraft.potion.Potion;
|
import net.minecraft.potion.Potion;
|
||||||
import net.minecraft.util.AxisAlignedBB;
|
import net.minecraft.util.AxisAlignedBB;
|
||||||
import net.minecraft.util.DamageSource;
|
import net.minecraft.util.DamageSource;
|
||||||
@ -38,6 +39,11 @@ public class EntityDamageUtil {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static boolean attackEntityFromNT(EntityLivingBase living, DamageSource source, float amount, boolean ignoreIFrame, boolean allowSpecialCancel, double knockbackMultiplier, float pierceDT, float pierce) {
|
public static boolean attackEntityFromNT(EntityLivingBase living, DamageSource source, float amount, boolean ignoreIFrame, boolean allowSpecialCancel, double knockbackMultiplier, float pierceDT, float pierce) {
|
||||||
|
if(living instanceof EntityPlayerMP && source.getEntity() instanceof EntityPlayer) {
|
||||||
|
EntityPlayerMP playerMP = (EntityPlayerMP) living;
|
||||||
|
EntityPlayer attacker = (EntityPlayer) source.getEntity();
|
||||||
|
if(!playerMP.canAttackPlayer(attacker)) return false; //handles wack-ass no PVP rule as well as scoreboard friendly fire
|
||||||
|
}
|
||||||
DamageResistanceHandler.setup(pierceDT, pierce);
|
DamageResistanceHandler.setup(pierceDT, pierce);
|
||||||
boolean ret = attackEntityFromNTInternal(living, source, amount, ignoreIFrame, allowSpecialCancel, knockbackMultiplier);
|
boolean ret = attackEntityFromNTInternal(living, source, amount, ignoreIFrame, allowSpecialCancel, knockbackMultiplier);
|
||||||
//boolean ret = living.attackEntityFrom(source, amount);
|
//boolean ret = living.attackEntityFrom(source, amount);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user