File tree Expand file tree Collapse file tree 1 file changed +7
-1
lines changed
src/main/java/com/flansmod/common Expand file tree Collapse file tree 1 file changed +7
-1
lines changed Original file line number Diff line number Diff line change 99import net .minecraft .entity .EntityLivingBase ;
1010import net .minecraft .entity .player .EntityPlayer ;
1111import net .minecraft .network .NetHandlerPlayServer ;
12+ import net .minecraft .util .DamageSource ;
1213import net .minecraft .world .WorldServer ;
1314import net .minecraftforge .common .MinecraftForge ;
1415import 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
You can’t perform that action at this time.
0 commit comments