Skip to content

Commit d273da7

Browse files
authored
Merge pull request #13 from JT2AW15/pilot-effect-damage
Allow player to take certian damage while in vehicle
2 parents 69047fb + ff960cb commit d273da7

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

src/main/java/com/flansmod/common/PlayerHandler.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import net.minecraft.entity.EntityLivingBase;
1010
import net.minecraft.entity.player.EntityPlayer;
1111
import net.minecraft.network.NetHandlerPlayServer;
12+
import net.minecraft.util.DamageSource;
1213
import net.minecraft.world.WorldServer;
1314
import net.minecraftforge.common.MinecraftForge;
1415
import net.minecraftforge.event.entity.living.LivingAttackEvent;
@@ -54,7 +55,12 @@ public void onEntityHurt(LivingAttackEvent event)
5455
if(event instanceof LivingAttackEvent && (entity.getRidingEntity() instanceof EntityDriveable || entity.getRidingEntity() instanceof EntitySeat))
5556
{
5657
//TODO Set Drivable damage
57-
event.setCanceled(true);
58+
if((event.getSource() != DamageSource.MAGIC)
59+
&& (event.getSource() != DamageSource.WITHER)
60+
&& (event.getSource() != DamageSource.STARVE)
61+
&& (event.getSource() != DamageSource.ON_FIRE)
62+
&& (event.getSource() != DamageSource.OUT_OF_WORLD))
63+
event.setCanceled(true);
5864
}
5965
}
6066

0 commit comments

Comments
 (0)