Removes the need for cancellable in hookHandleFallDamage

Author: IceCryptonym

patchwork-events-entity/src/main/java/com/patchworkmc/impl/event/entity/EntityEvents.java

@@ -87,17 +87,16 @@ public static boolean onLivingAttack(LivingEntity entity, DamageSource src, floa
 	public static float onLivingHurt(LivingEntity entity, DamageSource src, float damage) {
 		LivingHurtEvent event = new LivingHurtEvent(entity, src, damage);
 		return MinecraftForge.EVENT_BUS.post(event) ? 0 : event.getAmount();
-    }
-    
-    public static float[] onLivingFall(LivingEntity entity, float distance, float damageMultiplier) {
-        LivingFallEvent event = new LivingFallEvent(entity, distance, damageMultiplier);
-        return MinecraftForge.EVENT_BUS.post(event) ? null : new float[]{ event.getDistance(), event.getDamageMultiplier() };
-    }
-
-    public static void onPlayerFall(PlayerEntity player, float distance, float damageMultiplier)
-    {
-        MinecraftForge.EVENT_BUS.post(new PlayerFlyableFallEvent(player, distance, damageMultiplier));
-    }
+	}
+
+	public static float[] onLivingFall(LivingEntity entity, float distance, float damageMultiplier) {
+		LivingFallEvent event = new LivingFallEvent(entity, distance, damageMultiplier);
+		return MinecraftForge.EVENT_BUS.post(event) ? null : new float[]{ event.getDistance(), event.getDamageMultiplier() };
+	}
+
+	public static void onPlayerFall(PlayerEntity player, float distance, float damageMultiplier) {
+		MinecraftForge.EVENT_BUS.post(new PlayerFlyableFallEvent(player, distance, damageMultiplier));
+	}
 
 	public static Result canEntitySpawn(MobEntity entity, IWorld world, double x, double y, double z, MobSpawnerLogic spawner, SpawnType spawnType) {
 		if (entity == null) {
@@ -191,5 +190,5 @@ public void onInitialize() {
 		});
 
 		// TODO: Note: UseEntityCallback is closer to EntityInteractSpecific. We're on our own for EntityInteract.
-    }
+	}
 }

patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinLivingEntity.java

@@ -34,8 +34,8 @@
 
 @Mixin(LivingEntity.class)
 public class MixinLivingEntity {
-    @Unique
-    private float[] fallData;
+	@Unique
+	private float[] fallData;
 
 	// TODO: Forge bug: PlayerEntity calls its super, so this event gets fired twice on the client.
 	@Inject(method = "onDeath", at = @At("HEAD"), cancellable = true)
@@ -88,13 +88,14 @@ private float hookHandleFallDamageDistance(float distance, float damageMultiplie
 	@ModifyVariable(method = "handleFallDamage", at = @At(value = "INVOKE", target = "net/minecraft/entity/Entity.handleFallDamage(FF)V", shift = At.Shift.AFTER), ordinal = 1)
 	private float hookHandleFallDamageMultiplier(float distance, float damageMultiplier) {
 		return fallData[1];
-	} 
+	}
 
 	@Inject(method = "handleFallDamage", at = @At("HEAD"), cancellable = true)
 	private void hookHandleFallDamageCancel(float distance, float damageMultiplier, CallbackInfo info) {
 		LivingEntity entity = (LivingEntity) (Object) this;
 
 		fallData = EntityEvents.onLivingFall(entity, distance, damageMultiplier);
+
 		if (fallData == null) {
 			info.cancel();
 		}

patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinPlayerEntity.java

@@ -39,8 +39,8 @@
 
 @Mixin(PlayerEntity.class)
 public class MixinPlayerEntity {
-    @Shadow
-    public PlayerAbilities abilities;
+	@Shadow
+	public PlayerAbilities abilities;
 
 	@Inject(method = "interact", at = @At("HEAD"), cancellable = true)
 	private void hookInteractEntity(Entity entity, Hand hand, CallbackInfoReturnable<ActionResult> callback) {
@@ -104,14 +104,11 @@ private void hookApplyDamageForHurtEventCancel(DamageSource source, float damage
 		}
 	}
 
-	@Inject(method = "handleFallDamage", at = @At("RETURN"), cancellable = true)
-	private void hookHandleFallDamage(float distance, float damageMultiplier, CallbackInfo info) {
-		if (!abilities.allowFlying) {
-			info.cancel();
-			return;
+	@Inject(method = "handleFallDamage", at = @At("RETURN"))
+	private void hookHandleFallDamage(float distance, float damageMultiplier) {
+		if (abilities.allowFlying) {
+			PlayerEntity player = (PlayerEntity) (Object) this;
+			EntityEvents.onPlayerFall(player, distance, damageMultiplier);
 		}
-
-		PlayerEntity player = (PlayerEntity) (Object) this;
-		EntityEvents.onPlayerFall(player, distance, damageMultiplier);
 	}
 }

patchwork-events-entity/src/main/java/net/minecraftforge/event/entity/living/LivingFallEvent.java

@@ -23,20 +23,20 @@
 
 /**
  * LivingFallEvent is fired when an Entity is set to be falling.
- * 
+ *
  * <p>This event is fired whenever an Entity is set to fall in
- * {@link LivingEvent#fall(float, float)}.
- * 
- * For players that are able to fly, {@link net.minecraftforge.event.entity.player.PlayerFlyableFallEvent} will be fired instead.</p>
- * 
+ * {@link LivingEvent#fall(float, float)}.</p>
+ *
+ * <p>For players that are able to fly, {@link net.minecraftforge.event.entity.player.PlayerFlyableFallEvent} will be fired instead.</p>
+ *
  * <p>This event is fired via {@link com.patchworkmc.impl.event.entity.EntityEvents#onLivingFall(LivingEntity, float, float)}.</p>
- * 
+ *
  * <p>{@link #distance} contains the distance the Entity is to fall. If this event is cancelled, this value is set to 0.0F.</p>
- * 
+ *
  * <p>This event is cancellable.
  * If this event is cancelled, the Entity does not fall.</p>
- * 
- * This event is fired on the {@link MinecraftForge#EVENT_BUS}.
+ *
+ * <p>This event is fired on the {@link MinecraftForge#EVENT_BUS}.</p>
  */
 public class LivingFallEvent extends LivingEvent {
 	private float distance;