Oops. Missed a few merge conflicts.

Author: IceCryptonym

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

@@ -95,19 +95,18 @@ public static float onLivingHurt(LivingEntity entity, DamageSource src, float da
 		return MinecraftForge.EVENT_BUS.post(event) ? 0 : event.getAmount();
 	}
 
-<<<<<<< HEAD
 	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 onFlyablePlayerFall(PlayerEntity player, float distance, float damageMultiplier) {
 		MinecraftForge.EVENT_BUS.post(new PlayerFlyableFallEvent(player, distance, damageMultiplier));
-=======
+	}
+
 	public static float onLivingDamage(LivingEntity entity, DamageSource src, float damage) {
 		LivingDamageEvent event = new LivingDamageEvent(entity, src, damage);
 		return MinecraftForge.EVENT_BUS.post(event) ? 0 : event.getAmount();
->>>>>>> upstream/master
 	}
 
 	public static Result canEntitySpawn(MobEntity entity, IWorld world, double x, double y, double z, MobSpawnerLogic spawner, SpawnType spawnType) {

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

@@ -104,20 +104,19 @@ private void hookApplyDamageForHurtEventCancel(DamageSource source, float damage
 		}
 	}
 
-<<<<<<< HEAD
 	@Inject(method = "handleFallDamage", at = @At("RETURN"))
 	private void hookHandleFallDamage(float distance, float damageMultiplier) {
 		if (abilities.allowFlying) {
 			PlayerEntity player = (PlayerEntity) (Object) this;
 			EntityEvents.onFlyablePlayerFall(player, distance, damageMultiplier);
 		}
-=======
+	}
+
 	// No shift, because we are specifically not modifying the value for this function call.
 	@ModifyVariable(method = "applyDamage", argsOnly = true, at = @At(value = "INVOKE", target = "net/minecraft/entity/player/PlayerEntity.setAbsorptionAmount (F)V", ordinal = 0))
 	private float hookApplyDamageForDamageEvent(float damage, DamageSource source) {
 		LivingEntity entity = (LivingEntity) (Object) this;
 
 		return EntityEvents.onLivingDamage(entity, source, damage);
->>>>>>> upstream/master
 	}
 }