upstream/Hardcore-Ender-Expansion
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Hardcore-Ender-Expansion.git synced 2026-10-26 14:24:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Honor PVP and team friendly fire in Charm of Slaughter Impact damage

Browse Source
This commit is contained in:
chylex committed 2016-07-18 04:26:47 +02:00
1 parent d7202c4700
commit 8daeb7795b
1 file changed
+1 -1
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/chylex/hee/mechanics/charms/handler/CharmEvents.java
+1 -1
View File
@@ -395,7 +395,7 @@ public final class CharmEvents{
List<EntityLivingBase> entities = e.entity.worldObj.getEntitiesWithinAABB(EntityLivingBase.class,e.entity.boundingBox.expand(impactRad[a],impactRad[a],impactRad[a]));
for(EntityLivingBase entity:entities){
if (entity == sourcePlayer || entity == e.entity)continue;
if (entity == sourcePlayer || entity == e.entity || (entity instanceof EntityPlayer && !sourcePlayer.canAttackPlayer((EntityPlayer)entity)))continue;
if (entity.getDistanceToEntity(e.entity) <= impactRad[a]){
entity.attackEntityFrom(DamageSource.generic,impactAmt[a]*lastDamage);
PacketPipeline.sendToAllAround(e.entity,64D,new C22EffectLine(FXType.Line.CHARM_SLAUGHTER_IMPACT,entity,e.entity));